Skip to content

Commit

Permalink
.htaccess but not working. nav structure cleaned
Browse files Browse the repository at this point in the history
  • Loading branch information
Aliasger Rasheed committed Oct 17, 2019
1 parent 0381f57 commit 19db6c5
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 235 deletions.
8 changes: 8 additions & 0 deletions .htaccess
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
RewriteEngine on


RewriteCond %{THE_REQUEST} /([^.]+)\.html [NC]
RewriteRule ^ /%1 [NC,L,R]

RewriteCond %{REQUEST_FILENAME}.html -f
RewriteRule ^ %{REQUEST_URI}.html [NC,L]
266 changes: 31 additions & 235 deletions css/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
/* font import */
@import "fonts.css";


@font-face {
font-family: "League Spartan";
src: url("css/fonts/LeagueSpartan.eot");
src:
url("css/fonts/Harabara.woff") format("woff"),
url("css\fonts\LeagueSpartan-Black.otf") format("opentype"),
url("css/fonts/Harabara.svg#filename") format("svg");
}




/* TEXT STYLING */
:root {
--primary-color: black;
Expand All @@ -24,8 +10,6 @@
--secondary-font: "Be Vietnam";
}



h1,
h2,
h3,
Expand All @@ -49,22 +33,6 @@ a {
font-weight: 400;
}

p {
text-align: left;
}

div.body-copy {
margin: 2rem 0 0 0;
}

div.headings * {
margin: 0.3em 0 0.3em 0;

}

div.body-copy * {
margin: 0.3em 0 0.3em 0;
}

/* --------------nav------------ */
.top-bar {
Expand All @@ -87,40 +55,43 @@ div.body-copy * {
font-weight: 700
}

nav.guide {
background-color: #FFFFFF;
overflow: hidden;
top: 100px;
width: 100%;
padding: 15px;
#nav-bar a {
/* float: left; */
display: block;
color: black;
text-align: center;
border: 1px solid lightgrey;

}

nav.guide a {
/* padding: 14px 16px; */
text-decoration: none;
color: black;
padding: 2rem;
font-size: 14px;
}

nav.guide a:hover,
nav.guide a:focus {
text-decoration: none;
#logo-cont {
padding-left: 2rem;
/* width: 15vw; */
/* float: left; */
/* display: flex;
overflow: hidden;
justify-content: center;
align-items: center; */
}

nav.guide a:hover {
background-color: #ddd;
color: black;
#logo-cont a {
display: inline-block;

}

nav.guide a:focus {
background-color: #89C97B;
/* #search-nav-container {
padding: 1.25rem;
} */

#search-container {

padding-left: 8vw;
}

nav.guide a.active {
background-color: #4CAF50;
color: white;
#nav-container a {
padding: 1rem;

}

/* BODY */
Expand All @@ -136,32 +107,6 @@ body {
background-color: #F5F5F5;
}

.brand-div {
padding: 3rem;
background-color: #FFFFFF;
margin-bottom: 4rem;
}

.logo-div {
padding: 3rem;
background-color: #FFFFFF;
margin-bottom: 4rem;
}

.color-palette-div {
padding: 3rem;
background-color: #FFFFFF;
margin-bottom: 4rem;
}

.typeface-div {
padding: 3rem;
padding-bottom: 10vh;
background-color: #FFFFFF;
margin-bottom: 4rem;
}


#subscription {
/* padding-left: 10rem; */
}
Expand All @@ -187,30 +132,6 @@ body {

/* ~~~ https://www.w3schools.com/howto/howto_css_checkout_form.asp used for checkout form ~~~ */

.col-25 {
-ms-flex: 25%;
/* IE10 */
flex: 25%;
}

.col-50 {
-ms-flex: 50%;
/* IE10 */
flex: 50%;
}

.col-75 {
-ms-flex: 75%;
/* IE10 */
flex: 75%;
}

.col-25,
.col-50,
.col-75 {
padding: 0 16px;
}


label {
margin-bottom: 10px;
Expand Down Expand Up @@ -239,55 +160,12 @@ label {
background-color: #45a049;
}

/* ~~~ https://www.w3schools.com/howto/howto_css_checkout_form.asp used for checkout form ~~~ */



section section {
text-align: left;
}

.logo-text {
color: #89C97B;
}

.color-palette {
margin: 1rem;
padding: 2.5rem;
background-color: #EAEDEF;
display: flex;
}

.color1 {
margin: 2.5rem;
padding-top: 7rem;
flex-grow: 1;
background-color: #89C97B;
}

.color2 {
margin: 2.5rem;
padding-top: 7rem;
flex-grow: 1;
background-color: #FFF;
}

.color3 {
margin: 2.5rem;
padding-top: 7rem;
flex-grow: 1;
background-color: #282828;
color: white;
}

.color-text {
padding-left: 1rem;
}

.main-page-div {}

#profile-section {
float: left;
/* float: left; */
width: 26vw;
background-color: #FFFFFF;
border: 0.5px solid lightgrey;
Expand All @@ -300,7 +178,7 @@ hr {
}

#content-section {
float: right;
/* float: right; */
margin-bottom: 3rem;
width: 50vw;
background-color: #FFFFFF;
Expand All @@ -314,101 +192,21 @@ hr {


/* --------------nav------------ */
.top-bar {
position: fixed;
top: 0px;
left: 0px;
background-color: #FFFFFF;
width: 100%;
}

/* styleguide navigation */
#logo-bar {
top: 0px;
left: 0px;
width: 100%;
}

#logo-bar h1 {
text-align: center;
font-size: 3rem;
font-weight: 700
}

/* main page navigation */
#nav-bar {
position: fixed;
top: 0px;
left: 0px;
background-color: #FFFFFF;
width: 100%;
padding-left: 9.5rem;
padding-right: 9.5rem;
overflow: hidden;
border: 0.5px solid lightgrey;
}

#nav-bar a {
float: left;
display: block;
color: black;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 14px;
}

#logo-container {
width: 15vw;
float: left;
overflow: hidden;
}

#search-nav-container {
padding: 1.25rem;
}

#search-container {
float: left;
overflow: hidden;
padding-left: 8vw;
}

#nav-bar input[type=text] {

width: 25vw;
padding: 6px;
padding-left: 12px;
margin-top: 8px;
margin-right: 16px;
font-size: 17px;
}

#nav-container {
float: right;
}

nav.guide {
background-color: #FFFFFF;
overflow: hidden;
top: 100px;
width: 100%;
padding: 15px;
text-align: center;
border: 1px solid lightgrey;
}

/*
.container {
background-color: #ffffff;
padding: 5px 20px 15px 20px;
border: 1px solid lightgrey;
border-radius: 3px;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.09), 0 6px 20px 0 rgba(0, 0, 0, 0.01);
}
} */

input[type=text] {
width: 90%;
margin-bottom: 20px;
padding: 12px;
border: 1px solid #ccc;
border-radius: 3px;
Expand Down Expand Up @@ -588,8 +386,6 @@ a.img-link>img:hover,
.imga.img-link>img:focus {
/* border-color: var(--primary-highlight-color); */
filter: brightness(100%);


}

/*---------------media queries------------------ */
Expand Down

0 comments on commit 19db6c5

Please sign in to comment.