aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanalelfe <nargiza.nosirova@mail.utoronto.ca>2016-07-08 09:10:38 +0000
committernanalelfe <nargiza.nosirova@mail.utoronto.ca>2016-07-08 09:10:38 +0000
commit6cb2c39d16970000b8e1be16087a83b9e5b7ea5b (patch)
tree1ae0df99f0768a29763f2c66caad27d080f90645
parentbcb47ec49eff126602b5b40b97cc9e8c5b4efde1 (diff)
parentd3f4c77dcee44e104dcfe85fe406e8568bac121b (diff)
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
-rw-r--r--assets/css/style.css32
-rw-r--r--index.html2
2 files changed, 29 insertions, 5 deletions
diff --git a/assets/css/style.css b/assets/css/style.css
index 9dfc6f1..b01dd44 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -41,6 +41,8 @@ a {
padding: 10%;
height: 3%;
width: auto;
+ /* Humair - I added this because size wasn't working for firefox*/
+ max-width: 150px;
}
@@ -97,14 +99,34 @@ main {
overflow: auto;
}
+/* Changes - main is a flex container for search content*/
+main{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+
+/* Changes - search is a flex container for h2 and bar, removed various attributes */
main #search {
- position: absolute;
- vertical-align: middle;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+
width: 60%;
- height: 80%;
+ height: 100%;
+ vertical-align: middle;
background-color: rgba(235,235,235, 0.7);
- margin-left: 20%;
- padding-top: 15%;
+
+}
+
+/* Changes - added h2 styiling for main */
+main #search h2{
+ font-family: 'Lato', sans-serif;
+ color: gray;
+ font-size: 2.5em;
+ margin: 4%;
}
main #search input[type=text] {
diff --git a/index.html b/index.html
index 79bf7ed..4014b0a 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
<title>Solutions Repo</title>
<link href="assets/css/style.css" rel="stylesheet" type="text/css">
+ <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
</head>
<body>
<div id="top-bar">
@@ -30,6 +31,7 @@
</div>
<main>
+
<div id='search'>
<h2>The solutions to all your problems.</h2>
<!--<img src="assets/images/down.png">-->