twisterarmy/theme_nin
1
0
Fork 0
mirror of https://github.com/twisterarmy/theme_nin.git synced 2025-02-07 04:24:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from slr/nin-v2

Browse Source 
sync with latest commits in miguelfreitas/twister-html
This commit is contained in:
Mylène Bressan 2015-08-31 14:56:54 +02:00
commit 96ab2a2b70
4 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
css/style.css
View File

@ -782,13 +782,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
right: 35px; right: 35px;
} }
.switch-mode {
cursor: pointer;
color: #A1B775;
position: absolute;
left: 0;
}
/* Composants */ /* Composants */
.twister-user { .twister-user {
position: relative; position: relative;
@ -825,7 +818,7 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
-webkit-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); box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
} }
.prompt-wrapper .modal-buttons, .prompt-wrapper .following-config-method-buttons { .prompt-wrapper .following-config-method-buttons {
padding: 0 20px 20px 0; padding: 0 20px 20px 0;
float: right; float: right;
} }
@ -845,14 +838,24 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
.prompt-wrapper .modal-header h3 span:hover, .prompt-wrapper .modal-header .login .module p span span:hover, .login .module p .prompt-wrapper .modal-header span span:hover { .prompt-wrapper .modal-header h3 span:hover, .prompt-wrapper .modal-header .login .module p span span:hover, .login .module p .prompt-wrapper .modal-header span span:hover {
cursor: default; cursor: default;
} }
.prompt-wrapper .modal-buttons {
margin: 4px 0;
text-align: right;
}
.prompt-wrapper .switch-mode {
display: inline-block;
float: left;
margin: 12px 4px 4px;
color: #A1B775;
cursor: pointer;
font-size: 0.8rem;
line-height: 0.8rem;
}
/************ 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-buttons {
display: none;
}
.prompt-wrapper.following-config-modal h2 { .prompt-wrapper.following-config-modal h2 {
text-transform: none; text-transform: none;
display: inline-block !important; display: inline-block !important;
@ -883,7 +886,7 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
.prompt-wrapper.reply.prompt-wrapper { .prompt-wrapper.reply.prompt-wrapper {
margin-top: -110px; margin-top: -110px;
} }
.prompt-wrapper.reply .modal-buttons, .prompt-wrapper.reply .post-expand, .prompt-wrapper.reply .post-interactions { .prompt-wrapper.reply .post-expand, .prompt-wrapper.reply .post-interactions {
display: none; display: none;
} }
.prompt-wrapper.reply .post-area { .prompt-wrapper.reply .post-area {
@ -1210,10 +1213,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
text-decoration: none; text-decoration: none;
} }
.profile-modal .modal-buttons {
display: none;
}
/************* TOP TEXTAREA ************ */ /************* TOP TEXTAREA ************ */
#postboard-top { #postboard-top {
position: relative; position: relative;

8
sass/layout/_modal.sass
View File

@ -187,14 +187,6 @@ $header-modal-height : $menu-height
.switch-mode
cursor: pointer
color: $main-color-color
position: absolute
left: 0
@extend .ion
@extend .ion-shuffle
/* Composants */ /* Composants */
.twister-user .twister-user

3
sass/layout/_profile.sass
View File

@ -157,6 +157,3 @@ $modal-postboard-post-height: 100%
@extend .ion-tox @extend .ion-tox
@extend .ion @extend .ion
.profile-modal .modal-buttons
display: none

19
sass/layout/_prompt.sass
View File

@ -10,7 +10,7 @@
width: 600px width: 600px
margin-left: -300px margin-left: -300px
+box-shadow(0 8px 33px rgba(#000, .3)) +box-shadow(0 8px 33px rgba(#000, .3))
.modal-buttons, .following-config-method-buttons .following-config-method-buttons
padding: 0 20px 20px 0 padding: 0 20px 20px 0
float: right float: right
.modal-content .modal-content
@ -27,6 +27,19 @@
color: white color: white
&:hover &:hover
cursor: default cursor: default
.modal-buttons
margin: 4px 0
text-align: right
.switch-mode
display: inline-block
float: left
margin: 12px 4px 4px
color: $main-color-color
cursor: pointer
font-size: .8rem
line-height: .8rem
@extend .ion
@extend .ion-shuffle
@ -34,8 +47,6 @@
.prompt-wrapper.following-config-modal .prompt-wrapper.following-config-modal
margin-top: -100px margin-top: -100px
.modal-buttons
display: none
h2 h2
text-transform: none text-transform: none
display: inline-block!important display: inline-block!important
@ -67,7 +78,7 @@
.prompt-wrapper.reply .prompt-wrapper.reply
&.prompt-wrapper &.prompt-wrapper
margin-top: -110px margin-top: -110px
.modal-buttons, .post-expand, .post-interactions .post-expand, .post-interactions
display: none display: none
.post-area .post-area
padding-bottom: 6px padding-bottom: 6px