twisterarmy/theme_nin
1
0
Fork 0
mirror of https://github.com/twisterarmy/theme_nin.git synced 2025-02-06 20:15:01 +00:00
Code Issues Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Mylene 2015-07-28 13:14:22 +02:00
parent c98e068f36
commit 46a04d1912
7 changed files with 69 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
css/style.css
View File

@ -163,12 +163,12 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
} }
/* '' */ /* '' */
.icon-plus:before, ul.userMenu-search-profiles button .follow:before { .icon-plus:before {
content: ""; content: "";
} }
/* '' */ /* '' */
.icon-minus:before, ul.userMenu-search-profiles button .unfollow:before { .icon-minus:before {
content: ""; content: "";
} }
@ -249,6 +249,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
list-style: none; list-style: none;
color: #444;
} }
html, body { html, body {
@ -362,13 +363,13 @@ h3 .isFollowing:after {
display: none; display: none;
} }
.box-shadow, .modal-wrapper, .prompt-wrapper, .postboard .post, .dashboard > .module, .dialog-modal, .mini-profile, ol.toptrends-list a, ul.dropdown-menu { .box-shadow, .modal-wrapper, .postboard .post, .dashboard > .module, .mini-profile, ol.toptrends-list a, ul.dropdown-menu {
-moz-box-shadow: 0 8px 13px rgba(17, 17, 17, 0); -moz-box-shadow: 0 8px 13px rgba(17, 17, 17, 0);
-webkit-box-shadow: 0 8px 13px rgba(17, 17, 17, 0); -webkit-box-shadow: 0 8px 13px rgba(17, 17, 17, 0);
box-shadow: 0 8px 13px rgba(17, 17, 17, 0); box-shadow: 0 8px 13px rgba(17, 17, 17, 0);
} }
.clear-fix:after, .userMenu ul:after, .modal-content:after, .modal-header:after, .direct-messages-thread .post:after, .mini-following-info a:after, .forEdition.profile-card:after, .expanded-content:after, .following .following-list li a:after, .network.singleBlock:after, .options .tab-content:after, .promoted-posts-only:after, ul.userMenu-search-profiles li:after, .mini-profile .post-area:after, .mini-profile-indicators:after, .profile-data:after, #postboard-top:after, #postboard-top .post-area:after, .who-to-follow ol:after, .twister-user:after { .clear-fix:after, .userMenu > ul:after, .modal-content:after, .modal-header:after, .direct-messages-thread .post:after, .mini-following-info a:after, .forEdition.profile-card:after, .expanded-content:after, .following .following-list li a:after, .network.singleBlock:after, .options .tab-content:after, .promoted-posts-only:after, ul.userMenu-search-profiles li:after, .mini-profile .post-area:after, .mini-profile-indicators:after, .profile-data:after, #postboard-top:after, #postboard-top .post-area:after, .who-to-follow ol:after, .twister-user:after {
content: ""; content: "";
display: table; display: table;
clear: both; clear: both;
@ -383,7 +384,6 @@ button, a.button {
font-size: 0.75rem; font-size: 0.75rem;
position: relative; position: relative;
font-weight: 300; font-weight: 300;
margin: 2px;
text-transform: uppercase; text-transform: uppercase;
-moz-transition-property: background, border-color; -moz-transition-property: background, border-color;
-o-transition-property: background, border-color; -o-transition-property: background, border-color;
@ -447,7 +447,7 @@ button.small, .modal-wrapper.who-to-follow-modal button, .who-to-follow.module l
background-color: #64676C; background-color: #64676C;
z-index: 2; z-index: 2;
} }
.userMenu ul { .userMenu > ul {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
@ -457,13 +457,13 @@ button.small, .modal-wrapper.who-to-follow-modal button, .who-to-follow.module l
background: url('../img/logo.png?1437893891') no-repeat 50% 50%; background: url('../img/logo.png?1437893891') no-repeat 50% 50%;
background-size: 20px; background-size: 20px;
} }
.userMenu ul li { .userMenu > ul li {
float: left; float: left;
margin: 0 20px 0 0; margin: 0 20px 0 0;
position: relative; position: relative;
display: block; display: block;
} }
.userMenu ul li > a { .userMenu > ul li > a {
line-height: 50px; line-height: 50px;
padding: 0 0.5em; padding: 0 0.5em;
display: inline-block; display: inline-block;
@ -475,10 +475,13 @@ button.small, .modal-wrapper.who-to-follow-modal button, .who-to-follow.module l
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.userMenu ul li > a:hover { .userMenu > ul li > a:hover {
color: white !important; color: white !important;
} }
.userMenu ul li.current a { .userMenu > ul li > a span {
color: rgba(255, 255, 255, 0.7) !important;
}
.userMenu > ul li.current a, .userMenu > ul li.current a span {
color: white !important; color: white !important;
} }
@ -647,27 +650,31 @@ button.small, .modal-wrapper.who-to-follow-modal button, .who-to-follow.module l
/*********** POPUP PROMPT ************ */ /*********** POPUP PROMPT ************ */
.prompt-wrapper { .prompt-wrapper {
background: white; background: #FDFCFA;
z-index: 5; z-index: 5;
position: fixed; position: fixed;
top: 50%; top: 50%;
left: 50%; left: 50%;
width: 600px; width: 600px;
margin-left: -300px; margin-left: -300px;
-moz-box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
} }
.prompt-wrapper .modal-buttons { .prompt-wrapper .modal-buttons {
padding: 10px; padding: 10px;
text-align: right; text-align: right;
} }
.prompt-wrapper .modal-content {
background: #FDFCFA;
padding: 10px 10px 30px 10px;
text-align: center;
}
/************ FOLLOWING-CONFIG MODAL ********* */ /************ FOLLOWING-CONFIG MODAL ********* */
.prompt-wrapper.following-config-modal { .prompt-wrapper.following-config-modal {
margin-top: -100px; margin-top: -100px;
} }
.prompt-wrapper.following-config-modal .modal-content {
padding: 10px;
text-align: center;
}
.prompt-wrapper.following-config-modal .modal-buttons { .prompt-wrapper.following-config-modal .modal-buttons {
display: none; display: none;
} }
@ -994,6 +1001,7 @@ button.small, .modal-wrapper.who-to-follow-modal button, .who-to-follow.module l
.profile-modal .modal-content .profile-card { .profile-modal .modal-content .profile-card {
margin: 0; margin: 0;
padding: 0; padding: 0;
border-bottom: 1px solid #EBEBEB;
} }
.profile-modal .modal-content .profile-data { .profile-modal .modal-content .profile-data {
background: none; background: none;
@ -1866,6 +1874,9 @@ button.small, .modal-wrapper.who-to-follow-modal button, .who-to-follow.module l
border-top: 1px solid #EBEBEB; border-top: 1px solid #EBEBEB;
padding: 10px; padding: 10px;
} }
.dashboard > .module small {
display: none;
}
/********** CONFIG SUBMENU & SEARCH RESULTS *********** */ /********** CONFIG SUBMENU & SEARCH RESULTS *********** */
.dialog-modal { .dialog-modal {
@ -1876,6 +1887,9 @@ button.small, .modal-wrapper.who-to-follow-modal button, .who-to-follow.module l
right: -10px; right: -10px;
width: 250px; width: 250px;
overflow: hidden; overflow: hidden;
-moz-box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
} }
.userMenu-search .dialog-modal:after { .userMenu-search .dialog-modal:after {
@ -1891,12 +1905,11 @@ button.small, .modal-wrapper.who-to-follow-modal button, .who-to-follow.module l
ul.userMenu-search-profiles { ul.userMenu-search-profiles {
width: 100%; width: 100%;
padding: 0; padding: 0;
background: white; background: #FDFCFA;
} }
ul.userMenu-search-profiles li { ul.userMenu-search-profiles li {
float: none; float: none;
display: block; display: block;
padding: 5px 10px;
margin: 0; margin: 0;
border-bottom: 1px solid #EBEBEB; border-bottom: 1px solid #EBEBEB;
} }
@ -1909,7 +1922,7 @@ ul.userMenu-search-profiles .mini-profile-name {
ul.userMenu-search-profiles .mini-profile-photo { ul.userMenu-search-profiles .mini-profile-photo {
width: 30px; width: 30px;
height: 30px; height: 30px;
margin: 0 10px 0 0; margin: 10px;
float: left; float: left;
} }
ul.userMenu-search-profiles .mini-profile-info { ul.userMenu-search-profiles .mini-profile-info {
@ -1917,25 +1930,18 @@ ul.userMenu-search-profiles .mini-profile-info {
float: none; float: none;
} }
ul.userMenu-search-profiles button { ul.userMenu-search-profiles button {
padding: 3px; padding: 3px 5px;
} -moz-border-radius: 2px;
ul.userMenu-search-profiles button:after { -webkit-border-radius: 2px;
content: ""; border-radius: 2px;
font-family: "fontello";
}
ul.userMenu-search-profiles button .follow .unfollow {
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
right: 10px; right: 10px;
} }
ul.userMenu-search-profiles button .follow .unfollow:hover { ul.userMenu-search-profiles button:after {
background-color: #aaa; content: "";
} font-family: "fontello";
ul.userMenu-search-profiles button .follow { font-size: 1.1rem;
background-color: #A1B775;
}
ul.userMenu-search-profiles button .unfollow {
background-color: #222;
} }
.userMenu-search input[type="text"] { .userMenu-search input[type="text"] {
@ -2392,17 +2398,6 @@ img.twister-user-photo {
} }
/***********TOP TRENDS************** */ /***********TOP TRENDS************** */
.toptrends.module {
margin: 0 0 20px 0;
padding: 0 20px;
}
.toptrends small {
display: none;
}
.toptrends h3 {
float: left;
}
ol.toptrends-list { ol.toptrends-list {
margin: 0; margin: 0;
margin-bottom: 10px; margin-bottom: 10px;
@ -2446,7 +2441,6 @@ ol.toptrends-list a:hover {
background: white; background: white;
} }
.twistday-reminder .twister-user-full, .twistday-reminder .twister-user-tag { .twistday-reminder .twister-user-full, .twistday-reminder .twister-user-tag {
padding: 0 0 0.5rem 0;
font-size: 1rem; font-size: 1rem;
line-height: 1rem; line-height: 1rem;
color: #444; color: #444;

1
sass/base/_commons.sass
View File

@ -2,6 +2,7 @@
outline: none!important outline: none!important
+box-sizing(border-box) +box-sizing(border-box)
list-style: none list-style: none
color: $defaut-font-color
html, body html, body

1
sass/base/_utils.sass
View File

@ -23,7 +23,6 @@ button, a.button
font-size: .75rem font-size: .75rem
position: relative position: relative
font-weight: 300 font-weight: 300
margin: 2px
text-transform: uppercase text-transform: uppercase
+transition-property(background, border-color) +transition-property(background, border-color)
+transition-duration(.1s) +transition-duration(.1s)

7
sass/layout/_menu.sass
View File

@ -13,7 +13,7 @@ $menu-font-color: white
//+background-image(linear-gradient(to left , $color-green, $color-green, #5E80A2) ) //+background-image(linear-gradient(to left , $color-green, $color-green, #5E80A2) )
z-index: 2 z-index: 2
ul > ul
@extend .clear-fix @extend .clear-fix
+box-sizing(border-box) +box-sizing(border-box)
width: 100% width: 100%
@ -37,7 +37,9 @@ $menu-font-color: white
+box-sizing(border-box) +box-sizing(border-box)
&:hover &:hover
color: $menu-font-color!important color: $menu-font-color!important
&.current a > a span
color: rgba($menu-font-color, 0.7)!important
&.current a, &.current a span
color: $menu-font-color!important color: $menu-font-color!important
//+text-shadow(1px 1px 0 rgba(#000,.2)) //+text-shadow(1px 1px 0 rgba(#000,.2))
@ -82,6 +84,7 @@ $menu-font-color: white
color: $main-color-dark color: $main-color-dark
&.userMenu-search &.userMenu-search
margin: 3px margin: 3px
> input > input
border: 1px solid $main-color-light border: 1px solid $main-color-light
line-height: 12px line-height: 12px

12
sass/layout/_modal.sass
View File

@ -120,26 +120,28 @@ $header-modal-height : $menu-height
/*********** POPUP PROMPT *************/ /*********** POPUP PROMPT *************/
.prompt-wrapper .prompt-wrapper
background: rgba( 255, 255,255, 1.0 ) background: $bloc-light-color
z-index: 5 z-index: 5
position: fixed position: fixed
top: 50% top: 50%
left: 50% left: 50%
width: 600px width: 600px
margin-left: -300px margin-left: -300px
@extend .box-shadow +box-shadow(0 8px 33px rgba(#000, .3))
.modal-buttons .modal-buttons
padding: 10px padding: 10px
text-align: right text-align: right
.modal-content
background: $bloc-light-color
padding: 10px 10px 30px 10px
text-align: center
/************ FOLLOWING-CONFIG MODAL **********/ /************ FOLLOWING-CONFIG MODAL **********/
.prompt-wrapper.following-config-modal .prompt-wrapper.following-config-modal
margin-top: -100px margin-top: -100px
.modal-content
padding: 10px
text-align: center
.modal-buttons .modal-buttons
display: none display: none
h2 h2

1
sass/layout/_profile.sass
View File

@ -42,6 +42,7 @@ $modal-postboard-post-height: 100%
.profile-card .profile-card
margin: 0 margin: 0
padding: 0 padding: 0
border-bottom: 1px solid $main-background-color
.profile-data .profile-data
background: none background: none

42
sass/style.sass
View File

@ -89,7 +89,8 @@
clear: left clear: left
border-top: 1px solid $main-background-color border-top: 1px solid $main-background-color
padding: 10px padding: 10px
small
display: none
@ -105,7 +106,7 @@
right: -10px right: -10px
width: 250px width: 250px
overflow: hidden overflow: hidden
@extend .box-shadow +box-shadow(0 8px 33px rgba(#000, .3))
.userMenu-search .dialog-modal:after .userMenu-search .dialog-modal:after
right: auto right: auto
@ -116,14 +117,16 @@
padding: 10px padding: 10px
ul.userMenu-search-profiles ul.userMenu-search-profiles
width: 100% width: 100%
padding: 0 padding: 0
background: white background: $bloc-light-color
li li
float: none float: none
display: block display: block
padding: 5px 10px
margin: 0 margin: 0
@extend .clear-fix @extend .clear-fix
border-bottom: 1px solid $main-background-color border-bottom: 1px solid $main-background-color
@ -135,30 +138,24 @@ ul.userMenu-search-profiles
.mini-profile-photo .mini-profile-photo
width: 30px width: 30px
height: 30px height: 30px
margin: 0 10px 0 0 margin: 10px
float: left float: left
.mini-profile-info .mini-profile-info
width: 100% width: 100%
float: none float: none
button button
padding: 3px padding: 3px 5px
+border-radius(2px)
@extend .extend-icon @extend .extend-icon
&:after &:after
content: '' content: ''
font-family: $symbol-font-family font-family: $symbol-font-family
.follow .unfollow font-size: 1.1rem
position: absolute position: absolute
bottom: 10px bottom: 10px
right: 10px right: 10px
&:hover
background-color: $main-color-light
.follow
background-color: $main-color-color
@extend .icon-plus
.unfollow
background-color: $main-color-dark
@extend .icon-minus
.userMenu-search input[type="text"] .userMenu-search input[type="text"]
@ -589,13 +586,7 @@ img.twister-user-photo
/***********TOP TRENDS***************/ /***********TOP TRENDS***************/
.toptrends .toptrends
&.module
margin: 0 0 20px 0
padding: 0 20px
small
display: none
h3
float: left
ol.toptrends-list ol.toptrends-list
margin: 0 margin: 0
@ -636,7 +627,6 @@ ol.toptrends-list
background: white background: white
.twister-user-full, .twister-user-tag .twister-user-full, .twister-user-tag
padding: 0 0 .5rem 0
font-size: 1rem font-size: 1rem
line-height: 1rem line-height: 1rem
color: $defaut-font-color color: $defaut-font-color