diff --git a/css/_font.scss b/css/_font.scss index 99972b853..a6164657d 100644 --- a/css/_font.scss +++ b/css/_font.scss @@ -69,6 +69,9 @@ .icon-exit-full-screen:before { content: "\e90c"; } +.icon-star:before { + content: "\e916"; +} .icon-star-full:before { content: "\e90a"; } @@ -105,9 +108,6 @@ .icon-settings:before { content: "\e915"; } -.icon-star:before { - content: "\e916"; -} .icon-share-desktop:before { content: "\e917"; } diff --git a/css/_variables.scss b/css/_variables.scss index 74895928b..4ea67fbad 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -61,4 +61,16 @@ $defaultWatermarkLink: '../images/watermark.png'; * Z-indexes. TODO: Replace this by a function. */ $toolbarZ: 900; -$overlayZ: 800; \ No newline at end of file +$overlayZ: 800; + +/** + * Font Colors TODO: Change colors when general dialogs are implemented. + */ +$defaultFontColor: #777; +$defaultLightFontColor: #F1F1F1; +$defaultDarkFontColor: #000; +$buttonFontColor: #777; +$buttonHoverFontColor: #287ade; +$linkFontColor: #489afe; +$linkHoverFontColor: #287ade; + diff --git a/css/main.scss b/css/main.scss index 76b68d929..214cd599f 100644 --- a/css/main.scss +++ b/css/main.scss @@ -22,6 +22,8 @@ @import 'toastr'; @import 'base'; @import 'overlay/overlay'; +@import 'modals/dialog'; +@import 'modals/feedback/feedback'; @import 'videolayout_default'; @import 'jquery-impromptu'; @import 'modaldialog'; @@ -38,7 +40,6 @@ @import 'toolbars'; @import 'side_toolbar_container'; @import 'device_settings_dialog'; -@import 'feedback'; @import 'jquery.contextMenu'; @import 'keyboard-shortcuts'; diff --git a/css/modals/_dialog.scss b/css/modals/_dialog.scss new file mode 100644 index 000000000..c3cea92ca --- /dev/null +++ b/css/modals/_dialog.scss @@ -0,0 +1,37 @@ +.dialog{ + visibility: visible; + height: auto; + + p { + color: $defaultDarkFontColor; + } + .aui-dialog2-content:last-child { + border-bottom-right-radius: 5px; + border-bottom-left-radius: 5px; + } + .aui-dialog2-content:first-child { + border-top-right-radius: 5px; + border-top-left-radius: 5px; + } + .aui-dialog2-footer{ + padding-top: 0; + } + .aui-button { + height: 36px; + padding-top: 12px; + border: none; + background-color: transparent!important; + border-left: solid 1px #e4e4e4; + font-weight: 700; + + &_close { + color: $defaultFontColor; + } + &_submit { + color: $linkFontColor; + &:hover { + color: $linkHoverFontColor; + } + } + } +} \ No newline at end of file diff --git a/css/_feedback.scss b/css/modals/feedback/_feedback.scss similarity index 55% rename from css/_feedback.scss rename to css/modals/feedback/_feedback.scss index e065e5b18..50cf92324 100644 --- a/css/_feedback.scss +++ b/css/modals/feedback/_feedback.scss @@ -33,6 +33,8 @@ } .shake-rotate { + display: inline-block; + -webkit-animation-duration: .4s; animation-duration: .4s; -webkit-animation-iteration-count: infinite; @@ -43,65 +45,65 @@ animation-timing-function: ease-in-out } -.text-center { - text-align: center; -} - -.feedbackDetails textarea { - resize: vertical; - min-height: 100px; -} - -.feedback-rating { - line-height: 1.2; - padding: 20px 0; - +.feedback { h2 { font-weight: 400; font-size: 24px; line-height: 1.2; - padding: auto; - margin: auto; - border: none; } - p { - margin-top: 10px; - margin-left: 0px; - margin-bottom: 0px; - margin-right: 0px; + font-weight: 400; + font-size: 14px; } - .star-label { - font-size: 16px; - color: $rateStarLabelColor; + &__content { + text-align: center; } + &__footer { - .star-btn { - color: $rateStarDefault; - font-size: 36px; - position: relative; - cursor: pointer; - outline: none; - text-decoration: none; - @include transition(all .2s ease); - - &.starHover, - &.active, &:hover { - color: $rateStarActivity; + color: #287ade; + outline: 0; + } + } + &__rating { + line-height: 1.2; + padding: 20px 0; - .fa { - top: -6px; - } - }; - - &.rated:hover .fa { - top: 0; + p { + margin: 10px 0 0; } - .fa { + .star-label { + font-size: 16px; + color: $rateStarLabelColor; + } + + .star-btn { + color: $rateStarDefault; + font-size: 36px; position: relative; + cursor: pointer; + outline: none; + text-decoration: none; + @include transition(all .2s ease); + + &.starHover, + &.active, + &:hover { + color: $rateStarActivity; + > i:before { + content: "\e90a"; + } + }; + + } + } + &__details { + text-align: left; + textarea { + min-height: 100px; + width: 100%; } } } diff --git a/index.html b/index.html index e2023c0af..f98cc785f 100644 --- a/index.html +++ b/index.html @@ -262,5 +262,6 @@ +