Skip to content
This repository has been archived by the owner on May 18, 2021. It is now read-only.

Commit

Permalink
v2.10.1
Browse files Browse the repository at this point in the history
Removed floats from Header component
  • Loading branch information
sujan-s authored Mar 6, 2018
2 parents 377a6ad + 4f737b1 commit c3ace9d
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 86 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ It's still a bit rough around the edges, some functionality might break, but it

Just drop the `dist/fictoan.css` file into your project and you’re good to go.

`Current version is 2.10.0`

`Current version is 2.10.1`
65 changes: 25 additions & 40 deletions dist/fictoan.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/fictoan.css.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions dist/fictoan.min.css

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions dist/fictoan.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<h1 class="text-hue"><strong>FICTOAN Framework<span class="text-white">*</span></strong></h1>
<p class="text-white text-small">*Fuck I Couldn’t Think Of A Name Framework</p>
<h3 class="text-thin text-grey-30">&mdash;</h3>
<h3 class="margin-bottom-tiny text-grey-30">v2.10.0</h3>
<h3 class="margin-bottom-tiny text-grey-30">v2.10.1</h3>
<p class="text-regular text-large"><a href="https://github.com/sujan-s/fictoan/archive/master.zip" target="_blank">Download</a> / <a href="https://github.com/sujan-s/fictoan" target="_blank">Github</a> / <a href="docs/docs.html">view docs</a></p>
</div>
</div>
Expand Down
7 changes: 4 additions & 3 deletions scss/fictoan/base/_ff-layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
margin : 0 0 2vmax 0;
}

// Use 'box' class to have portions that add up to more than 100% width
// Use 'box' class to have portions that add up
// to more than 100% width
.box .portion { margin-bottom: $measureFixed*2; }

// Basics for the portions
Expand All @@ -19,8 +20,8 @@

// Remove the padding for nested portions
// .portion > .row {
// margin-left : -$measureFixed*3;
// margin-right : -$measureFixed*3;
// margin-left : -$measureFixed*3;
// margin-right : -$measureFixed*3;
// }

@media all and (max-width : 600px) {
Expand Down
64 changes: 24 additions & 40 deletions scss/fictoan/components/_ff-header.scss
Original file line number Diff line number Diff line change
@@ -1,48 +1,31 @@
.ff-header {
position : relative;
height : 56px;
display : flex;
position : relative;
height : 56px;
justify-content : space-between;
align-items : center;
}

.ff-content-container .ff-header { margin : 0 -2vmax; }

.ff-header.fixed-on-top {
position : fixed;
top : 0;
width : 100%;
z-index : 5000;
}

.ff-header.fixed-on-bottom {
position : fixed;
bottom : 0;
width : 100%;
z-index : 5000;
}

.ff-header.fixed-on-bottom.shadow-hard { box-shadow : 0 -4px 8px -2px rgba(0, 0, 0, 0.24); }
.ff-header.fixed-on-bottom.shadow-soft { box-shadow : 0 -16px 32px -8px rgba(0, 0, 0, 0.32); }
.ff-header.fixed-on-bottom.shadow-mild { box-shadow : 0 -2px 2px -2px rgba(0, 0, 0, 0.24); }

#header-logo {
float : left;
width : 20%;
max-width : 20%;
height : 56px;
justify-self : flex-start;
}

#header-logo img { height : 56px; }
#header-logo img {
width : auto;
height : 100%;
}

.header-links {
display : inline-block;
position : relative;
float : right;
top : 50%;
transform : translateY(-50%);
position : relative;
background-color : transparent;
}

.header-links { background-color : $headerLinkBG; }

.header-links a:not(.ff-button) {
color : $headerLinkColor;

&:hover { color : $headerLinkHoverColor; }
}

Expand Down Expand Up @@ -70,16 +53,15 @@
padding : 16px;
}

#menu-toggle:checked + .header-links { display : block; }

.header-links {
display : none;
position : absolute;
left : 0;
right : 0;
top : 56px;
transform : translateY(0);
box-shadow : 0 4px 8px rgba(10, 10, 10, 0.1);
display : none;
position : absolute;
left : 0;
right : 0;
top : 56px;
transform : translateY(0);
background-color : $headerLinkBG;
box-shadow : 0 4px 8px rgba(10, 10, 10, 0.1);

.nav-item { border-top : $navItemBorderColor; }

Expand All @@ -95,6 +77,8 @@
}
}

#menu-toggle:checked + .header-links { display : block; }

.header-links .nav-item {
width : 100%;
display : block;
Expand Down

0 comments on commit c3ace9d

Please sign in to comment.