From ca8ea8e3381ef4d55174b9e69c766a5ced1df441 Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Fri, 21 Aug 2015 09:27:53 +0500 Subject: [PATCH 1/3] update to miguelfreitas/twister-html#296 --- css/style.css | 24 +++++++++++++++--------- sass/layout/_profile.sass | 3 --- sass/layout/_prompt.sass | 19 ++++++++++++++----- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/css/style.css b/css/style.css index 519c100..75347ab 100644 --- a/css/style.css +++ b/css/style.css @@ -818,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); 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; float: right; } @@ -838,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 { 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: #8a8691; + cursor: pointer; + font-size: 0.8rem; + line-height: 0.8rem; +} /************ FOLLOWING-CONFIG MODAL ********* */ .prompt-wrapper.following-config-modal { margin-top: -100px; } -.prompt-wrapper.following-config-modal .modal-buttons { - display: none; -} .prompt-wrapper.following-config-modal h2 { text-transform: none; display: inline-block !important; @@ -876,7 +886,7 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover { .prompt-wrapper.reply.prompt-wrapper { 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; } .prompt-wrapper.reply .post-area { @@ -1203,10 +1213,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover { text-decoration: none; } -.profile-modal .modal-buttons { - display: none; -} - /************* TOP TEXTAREA ************ */ #postboard-top { position: relative; diff --git a/sass/layout/_profile.sass b/sass/layout/_profile.sass index c252dd7..6139b51 100644 --- a/sass/layout/_profile.sass +++ b/sass/layout/_profile.sass @@ -157,6 +157,3 @@ $modal-postboard-post-height: 100% @extend .ion-tox @extend .ion -.profile-modal .modal-buttons - display: none - diff --git a/sass/layout/_prompt.sass b/sass/layout/_prompt.sass index 6e78c72..e9c43bb 100644 --- a/sass/layout/_prompt.sass +++ b/sass/layout/_prompt.sass @@ -10,7 +10,7 @@ width: 600px margin-left: -300px +box-shadow(0 8px 33px rgba(#000, .3)) - .modal-buttons, .following-config-method-buttons + .following-config-method-buttons padding: 0 20px 20px 0 float: right .modal-content @@ -27,15 +27,24 @@ color: white &:hover cursor: default + .modal-buttons + margin: 4px 0 + text-align: right + .switch-mode + display: inline-block + float: left + margin: 12px 4px 4px + color: lighten($dark-grey,30%) + cursor: pointer + font-size: .8rem + line-height: .8rem + - /************ FOLLOWING-CONFIG MODAL **********/ .prompt-wrapper.following-config-modal margin-top: -100px - .modal-buttons - display: none h2 text-transform: none display: inline-block!important @@ -67,7 +76,7 @@ .prompt-wrapper.reply &.prompt-wrapper margin-top: -110px - .modal-buttons, .post-expand, .post-interactions + .post-expand, .post-interactions display: none .post-area padding-bottom: 6px From b25181793e5723d215704742db5ca5e625114f74 Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Fri, 21 Aug 2015 09:55:01 +0500 Subject: [PATCH 2/3] fix merge conflicts --- css/style.css | 7 ------- sass/layout/_modal.sass | 8 -------- sass/layout/_prompt.sass | 4 +++- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/css/style.css b/css/style.css index 00acb9a..957cb0d 100644 --- a/css/style.css +++ b/css/style.css @@ -782,13 +782,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover { right: 35px; } -.switch-mode { - cursor: pointer; - color: #A1B775; - position: absolute; - left: 0; -} - /* Composants */ .twister-user { position: relative; diff --git a/sass/layout/_modal.sass b/sass/layout/_modal.sass index 9290485..d80db79 100644 --- a/sass/layout/_modal.sass +++ b/sass/layout/_modal.sass @@ -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 */ .twister-user diff --git a/sass/layout/_prompt.sass b/sass/layout/_prompt.sass index e9c43bb..72b1106 100644 --- a/sass/layout/_prompt.sass +++ b/sass/layout/_prompt.sass @@ -34,10 +34,12 @@ display: inline-block float: left margin: 12px 4px 4px - color: lighten($dark-grey,30%) + color: $main-color-color cursor: pointer font-size: .8rem line-height: .8rem + @extend .ion + @extend .ion-shuffle From d18e8c66c655f5081af835e4247f9baa501de97f Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Fri, 21 Aug 2015 10:01:45 +0500 Subject: [PATCH 3/3] fix switch-mode color --- css/style.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css/style.css b/css/style.css index 957cb0d..6a14b46 100644 --- a/css/style.css +++ b/css/style.css @@ -839,14 +839,14 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover { cursor: default; } .prompt-wrapper .modal-buttons { - margin: 4px 0; - text-align: right; + margin: 4px 0; + text-align: right; } .prompt-wrapper .switch-mode { - display: inline-block; - float: left; - margin: 12px 4px 4px; - color: #8a8691; + display: inline-block; + float: left; + margin: 12px 4px 4px; + color: #A1B775; cursor: pointer; font-size: 0.8rem; line-height: 0.8rem;