Merge pull request #2283 from awesomerobot/master

pulling some more styles out of desktop/mobile to common/base
This commit is contained in:
Jeff Atwood 2014-04-20 12:24:29 -07:00
commit 7aecf5f6ef
17 changed files with 575 additions and 1746 deletions

View File

@ -0,0 +1,123 @@
.autocomplete {
z-index: 999999;
position: absolute;
width: 240px;
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
ul {
list-style: none;
padding: 0;
margin: 0;
li {
border-bottom: 1px solid $primary_border_color;
a[href] {
padding: 5px;
display: block;
span.username {
color: $primary_text_color;
}
span.name {
font-size: 11px;
}
&.selected {
background-color: lighten($secondary_background_color, 60%);
}
@include hover {
background-color: lighten($secondary_background_color, 60%);
text-decoration: none;
}
}
}
}
}
div.ac-wrap.disabled {
input {
display:none;
}
.item a {
display:none;
}
}
div.ac-wrap {
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
padding: 5px 10px;
div.item {
float: left;
margin-right: 10px;
margin-bottom: 5px;
span {
padding-left: 5px;
height: 22px;
display: inline-block;
line-height: 22px;
vertical-align: bottom;
}
a.remove {
margin-left: 4px;
font-size: 10px;
line-height: 10px;
padding: 2px 1px 1px 3px;
border-radius: 10px;
width: 10px;
display: inline-block;
border: 1px solid $primary_border_color;
&:hover {
background-color: $warning_background_color;
border: 1px solid $warning_border_color;
text-decoration: none;
color: $warning_text_color;
}
}
}
input[type="text"] {
float: left;
margin-top: 5px;
border: 0;
padding: 0;
margin: 4px 0 0;
box-shadow: none;
}
}
#reply-control.topic #wmd-quote-post {
display: none;
}
@media screen and (min-width: 1550px) {
#reply-control {
.wmd-controls {
width: 1450px;
left: auto;
right: auto;
}
}
}
.auto-close-fields {
input {
width: 150px;
}
.examples {
margin: 10px 0 0 0;
color: $secondary_text_color;
}
}
.edit-auto-close-modal {
form {
margin: 0;
}
.auto-close-fields {
i.fa-clock-o {
font-size: 16px;
line-height: 8px;
}
input {
margin: 0;
}
}
}

View File

@ -0,0 +1,161 @@
a.no-href {
cursor: pointer;
}
body {
button.ok {
background: $btn-success-background;
color: $tertiary_text_color;
@include hover {
background: lighten($btn-success-background, 10%);
color: $tertiary_text_color;
}
}
button.cancel {
background: $btn-danger-background-color;
color: $tertiary_text_color;
@include hover {
background: lighten($btn-danger-background-color, 10%);
color: $tertiary_text_color;
}
}
.coldmap-high {
color: $coldmap-high !important;
}
.coldmap-med {
color: $coldmap-med !important;
}
.coldmap-low {
color: $coldmap-low !important;
}
.heatmap-high {
color: $heatmap-high !important;
}
.heatmap-med {
color: $heatmap-med !important;
}
.heatmap-low {
color: $heatmap-low !important;
}
#loading-message {
position: absolute;
font-size: 30px;
text-align: center;
top: 120px;
left: 500px;
color: lighten($primary_text_color, 35%);
}
.top-space {
margin-top: 10px;
}
ul.breadcrumb {
margin: 0 10px 0 10px;
}
.message {
@include border-radius-all(8px);
background-color: $primary_background_color;
padding: 14px;
h2 {
margin-bottom: 20px;
}
p {
font-size: 20px;
}
}
#footer {
.container {
height: 50px;
.contents {
padding-top: 10px;
a[href] {
color: $tertiary_text_color;
}
}
}
}
.clear-transitions {
@include transition(none !important);
}
form {
.tip {
display: inline-block;
&.good {
color: $success_text_color;
}
&.bad {
color: $warning_text_color;
}
}
}
#wmd-input {
resize: none;
}
#pagedown-editor {
width: 540px;
background-color: $primary_background_color;
padding: 0 10px 13px 10px;
border: 1px solid $primary_border_color;
.preview {
margin-top: 8px;
border: 1px dashed $primary_border_color;
padding: 8px 8px 0 8px;
p {
margin: 0 0 10px 0;
}
}
.preview.hidden {
display: none;
}
}
.spinner {
width: 100px;
margin: 10px auto 30px auto;
background-color: #000;
@include border-radius-all(10px);
padding: 10px 10px 10px 30px;
font-size: 15px;
line-height: 23px;
text-align: center;
color: $primary_background_color;
background: {
image: image-url("spinner_96_w.gif");
repeat: no-repeat;
position: 10px 8px;
size: 25px;
};
-webkit-animation: spinner .25s;
animation: spinner .25s;
}
//loading spinner fade-in
@-webkit-keyframes spinner {
from {opacity: 0}
to {opacity: 1}
}@keyframes fade {
from {opacity: 0}
to {opacity: 1}
}
.avatar {
@include border-radius-all(2px);
}
.avatar-wrapper {
background-color: $primary_background_color;
display: inline-block;
border: 1px solid $primary_border_color;
@include border-radius-all(5px);
img {
@include border-radius-all(4px);
}
}
.profiler-results.profiler-left {
top: 60px !important;
}
}

View File

@ -0,0 +1,210 @@
.modal-open {
.dropdown-menu {
z-index: 2050;
}
.popover {
z-index: 2060;
}
.tooltip {
z-index: 2070;
}
}
.modal-backdrop {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1040;
background-color: $secondary_background_color;
&.fade {
opacity: 0;
}
}
.modal-backdrop,
.modal-backdrop.fade.in {
-webkit-animation: fade .25s;
animation: fade .25s;
opacity: 0.8;
filter: alpha(opacity=80);
}
//fade in
@-webkit-keyframes fade {
from {opacity: 0}
to {opacity: .8}
}@keyframes fade {
from {opacity: 0}
to {opacity: .8}
}
.modal-outer-container {
display:table;
width:100%;
height:100%;
}
.modal-inner-container {
max-width: 710px;
margin: 0 auto;
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
border: 1px solid lighten($primary_border_color, 10%);
box-shadow: 0 3px 7px rgba($primary_shadow_color, .8);
background-clip: padding-box;
}
.modal {
position: fixed;
top: 0;
width: 100%;
height: 100%;
z-index: 1050;
overflow: auto;
}
.modal-form {
margin-bottom: 0;
}
.modal-footer {
margin: 0 15px;
padding: 14px 0 15px;
border-top: 1px solid $primary_border_color;
}
.modal-footer:before,
.modal-footer:after {
display: table;
content: "";
}
.modal-footer:after {
clear: both;
}
.modal {
.nav {
padding: 10px 30px;
background-color: lighten($primary_background_color, 76%);
li > a {
font-size: 14px;
}
border-bottom: 1px solid $primary_border_color;
}
&.hidden {
display: none;
}
.modal-body {
textarea {
width: 99%;
height: 80px;
}
label {
color: lighten($primary_text_color, 35%);
}
p {
color: $primary_text_color;
font-size: 13px;
}
.archetype-option {
margin-bottom: 20px;
}
.warning {
color: $warning_text_color !important;
}
}
.password-confirmation {
display: none;
}
section.field {
margin-bottom: 20px;
}
}
.reply-where-modal {
width: 370px;
margin-left: -185px;
.modal-footer {
.btn {
text-align: left;
font-size: 18px;
line-height: 20px;
width: 310px;
margin-bottom: 10px;
display: block;
margin-left: 0;
.topic-title {
font-size: 13px;
font-weight: normal;
}
&.btn-reply-here {
background: lighten($secondary_background_color, 60%);
text-shadow: none;
color: lighten($primary_text_color, 35%);
}
}
.cancel {
text-decoration: underline;
float: right;
margin-right: 5px;
}
}
}
.delete-user-modal {
.modal-footer {
.btn {
font-weight: normal;
text-align: left;
font-size: 14px;
line-height: 20px;
margin-bottom: 10px;
display: inline-block;
margin-left: 0;
}
.cancel {
text-decoration: underline;
display: block;
margin-right: 5px;
}
}
}
.modal-footer .cancel-inline {
text-decoration: underline;
margin-left: 10px;
}
.invite-modal {
overflow: visible;
.ember-text-field {
width: 550px;
}
}
.permission-list{
list-style:none;
margin: 0 0 30px;
padding: 0;
.name {
margin-right: 20px;
display: inline-block;
min-width: 100px;
}
.permission {
margin-left: 20px;
}
.fa-times-circle {
margin-left: 5px;
}
li {
margin-bottom: 10px;
}
}

View File

@ -0,0 +1,11 @@
.add-upload .fa-plus {
font-size: 10px;
position: relative;
left: -5px;
bottom: -5px;
text-shadow:
-1px -1px 0 $btn-primary-background-color,
1px 1px 0 $btn-primary-background-color,
1px -1px 0 $btn-primary-background-color,
-1px 1px 0 $btn-primary-background-color;
}

View File

@ -0,0 +1,64 @@
// styling of bottom section
.user-stream .child-actions {
margin-top: 8px;
.avatar-link {
float: none;
}
.fa {
width: 15px;
display: inline-block;
color: $secondary_text_color;
}
.avatar-wrapper {
border: none;
}
.avatar-link {
margin-right: 3px;
}
}
.user-navigation {
.map {
height: 50px;
}
.avatar {
float: left;
width: 45px;
}
nav.buttons {
width: 180px;
padding: 0;
.btn {
width: 100%;
margin-bottom: 5px;
@include box-sizing(border-box);
}
}
h2 {
a {
font-size: 14px;
color: $link_color;
cursor: pointer;
}
}
}
.avatar-selector {
label {
display: inline-block;
margin-right: 10px;
}
#avatar-input {
width: 0;
height: 0;
overflow: hidden;
}
.avatar {
margin: 5px 10px 5px 0;
}
}

View File

@ -76,38 +76,7 @@
}
.autocomplete {
z-index: 999999;
position: absolute;
width: 240px;
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
ul {
list-style: none;
padding: 0;
margin: 0;
li {
border-bottom: 1px solid $primary_border_color;
a[href] {
padding: 5px;
display: block;
span.username {
color: $primary_text_color;
}
span.name {
font-size: 11px;
}
&.selected {
background-color: lighten($secondary_background_color, 60%);
}
@include hover {
background-color: lighten($secondary_background_color, 60%);
text-decoration: none;
}
}
}
}
}
#reply-control {
.toggle-preview, #draft-status, #file-uploading {
@ -381,58 +350,6 @@
margin-bottom: 10px;
}
div.ac-wrap.disabled {
input {
display:none;
}
.item a {
display:none;
}
}
div.ac-wrap {
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
padding: 5px 10px;
div.item {
float: left;
margin-right: 10px;
margin-bottom: 5px;
span {
padding-left: 5px;
height: 22px;
display: inline-block;
line-height: 22px;
vertical-align: bottom;
}
a.remove {
margin-left: 4px;
font-size: 10px;
line-height: 10px;
padding: 2px 1px 1px 3px;
border-radius: 10px;
width: 10px;
display: inline-block;
border: 1px solid $primary_border_color;
&:hover {
background-color: $warning_background_color;
border: 1px solid $warning_border_color;
text-decoration: none;
color: $warning_text_color;
}
}
}
input[type="text"] {
float: left;
margin-top: 5px;
border: 0;
padding: 0;
margin: 4px 0 0;
box-shadow: none;
}
}
#reply-control.edit-title.private-message {
.wmd-controls {
@include transition(top 0.3s ease);
@ -440,10 +357,6 @@ div.ac-wrap {
}
}
#reply-control.topic #wmd-quote-post {
display: none;
}
#reply-control {
&.hide-preview {
.wmd-controls {
@ -550,38 +463,3 @@ div.ac-wrap {
padding-left: 20px;
padding-right: 20px;
}
@media screen and (min-width: 1550px) {
#reply-control {
.wmd-controls {
width: 1450px;
left: auto;
right: auto;
}
}
}
.auto-close-fields {
input {
width: 150px;
}
.examples {
margin: 10px 0 0 0;
color: $secondary_text_color;
}
}
.edit-auto-close-modal {
form {
margin: 0;
}
.auto-close-fields {
i.fa-clock-o {
font-size: 16px;
line-height: 8px;
}
input {
margin: 0;
}
}
}

View File

@ -41,70 +41,17 @@ body {
}
}
a.no-href {
cursor: pointer;
}
header {
margin-bottom: 15px;
}
body {
button.ok {
background: $btn-success-background;
color: $tertiary_text_color;
@include hover {
background: lighten($btn-success-background, 10%);
color: $tertiary_text_color;
}
}
button.cancel {
background: $btn-danger-background-color;
color: $tertiary_text_color;
@include hover {
background: lighten($btn-danger-background-color, 10%);
color: $tertiary_text_color;
}
}
// tab focus in firefox
button:focus::-moz-focus-inner {
border: 1px dotted;
}
.coldmap-high {
color: $coldmap-high !important;
}
.coldmap-med {
color: $coldmap-med !important;
}
.coldmap-low {
color: $coldmap-low !important;
}
.heatmap-high {
color: $heatmap-high !important;
}
.heatmap-med {
color: $heatmap-med !important;
}
.heatmap-low {
color: $heatmap-low !important;
}
#loading-message {
position: absolute;
font-size: 30px;
text-align: center;
top: 120px;
left: 500px;
color: lighten($primary_text_color, 35%);
}
.top-space {
margin-top: 10px;
}
ul.breadcrumb {
margin: 0 10px 0 10px;
}
.boxed {
height: 100%;
@include border-radius-all(5px);
@ -164,32 +111,6 @@ body {
}
}
/**/
.message {
@include border-radius-all(8px);
background-color: $primary_background_color;
padding: 14px;
h2 {
margin-bottom: 20px;
}
p {
font-size: 20px;
}
}
#footer {
.container {
height: 50px;
.contents {
padding-top: 10px;
a[href] {
color: $tertiary_text_color;
}
}
}
}
.clear-transitions {
@include transition(none !important);
}
.grippie {
width: 100%;
border: 1px solid $primary_border_color;
@ -203,18 +124,6 @@ body {
}
}
form {
.tip {
display: inline-block;
&.good {
color: $success_text_color;
}
&.bad {
color: $warning_text_color;
}
}
}
blockquote {
/* 13px left is intentional here to properly align with post quotes */
padding: 10px 4px 4px 13px;
@ -235,79 +144,6 @@ blockquote {
}
}
#wmd-input {
resize: none;
}
#pagedown-editor {
width: 540px;
background-color: $primary_background_color;
padding: 0 10px 13px 10px;
border: 1px solid $primary_border_color;
.preview {
margin-top: 8px;
border: 1px dashed $primary_border_color;
padding: 8px 8px 0 8px;
p {
margin: 0 0 10px 0;
}
}
.preview.hidden {
display: none;
}
}
.spinner {
width: 100px;
margin: 10px auto 30px auto;
background-color: #000;
@include border-radius-all(10px);
padding: 10px 10px 10px 30px;
font-size: 15px;
line-height: 23px;
text-align: center;
color: $primary_background_color;
background: {
image: image-url("spinner_96_w.gif");
repeat: no-repeat;
position: 10px 8px;
size: 25px;
};
-webkit-animation: spinner .25s;
animation: spinner .25s;
}
//loading spinner fade-in
@-webkit-keyframes spinner {
from {opacity: 0}
to {opacity: 1}
}@keyframes fade {
from {opacity: 0}
to {opacity: 1}
}
.avatar {
@include border-radius-all(2px);
}
.avatar-wrapper {
background-color: $primary_background_color;
display: inline-block;
border: 1px solid $primary_border_color;
@include border-radius-all(5px);
img {
@include border-radius-all(4px);
}
}
.profiler-results.profiler-left {
top: 60px !important;
}
/* bootstrap carryover */

View File

@ -1,76 +1,9 @@
// base styles for every modal popup used in Discourse
.modal-open {
.dropdown-menu {
z-index: 2050;
}
.popover {
z-index: 2060;
}
.tooltip {
z-index: 2070;
}
}
.modal-backdrop {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1040;
background-color: $secondary_background_color;
&.fade {
opacity: 0;
}
}
.modal-backdrop,
.modal-backdrop.fade.in {
-webkit-animation: fade .25s;
animation: fade .25s;
opacity: 0.8;
filter: alpha(opacity=80);
}
//fade in
@-webkit-keyframes fade {
from {opacity: 0}
to {opacity: .8}
}@keyframes fade {
from {opacity: 0}
to {opacity: .8}
}
.modal-outer-container {
display:table;
width:100%;
height:100%;
}
.modal-middle-container {
display:table-cell;
vertical-align: middle;
}
.modal-inner-container {
max-width: 710px;
margin: 0 auto;
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
border: 1px solid lighten($primary_border_color, 10%);
box-shadow: 0 3px 7px rgba($primary_shadow_color, .8);
background-clip: padding-box;
}
.modal {
position: fixed;
top: 0;
width: 100%;
height: 100%;
z-index: 1050;
overflow: auto;
}
// Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
.bootbox.modal {
@ -111,22 +44,7 @@ animation: modal .25s;
max-height: 400px;
padding: 15px;
}
.modal-form {
margin-bottom: 0;
}
.modal-footer {
margin: 0 15px;
padding: 14px 0 15px;
border-top: 1px solid $primary_border_color;
}
.modal-footer:before,
.modal-footer:after {
display: table;
content: "";
}
.modal-footer:after {
clear: both;
}
.modal-footer .btn + .btn {
margin-left: 5px;
margin-bottom: 0;
@ -159,16 +77,6 @@ animation: modal .25s;
}
.modal {
.nav {
padding: 10px 30px;
background-color: lighten($primary_background_color, 76%);
li > a {
font-size: 14px;
}
border-bottom: 1px solid $primary_border_color;
}
.category-combobox {
width: 430px;
@ -184,39 +92,8 @@ animation: modal .25s;
margin-top: 8px;
}
}
&.hidden {
display: none;
}
.modal-body {
textarea {
width: 99%;
height: 80px;
}
label {
color: lighten($primary_text_color, 35%);
}
p {
color: $primary_text_color;
font-size: 13px;
}
.archetype-option {
margin-bottom: 20px;
}
.warning {
color: $warning_text_color !important;
}
}
.password-confirmation {
display: none;
}
section.field {
margin-bottom: 20px;
}
}
.flag-modal {
max-height: 450px;
}
@ -282,7 +159,6 @@ animation: modal .25s;
height: 350px;
}
#move-selected {
p {
margin-top: 0;
@ -306,84 +182,3 @@ animation: modal .25s;
}
}
}
.invite-modal {
overflow: visible;
.ember-text-field {
width: 550px;
}
}
.reply-where-modal {
width: 370px;
margin-left: -185px;
.modal-footer {
.btn {
text-align: left;
font-size: 18px;
line-height: 20px;
width: 310px;
margin-bottom: 10px;
display: block;
margin-left: 0;
.topic-title {
font-size: 13px;
font-weight: normal;
}
&.btn-reply-here {
background: lighten($secondary_background_color, 60%);
text-shadow: none;
color: lighten($primary_text_color, 35%);
}
}
.cancel {
text-decoration: underline;
float: right;
margin-right: 5px;
}
}
}
.delete-user-modal {
.modal-footer {
.btn {
font-weight: normal;
text-align: left;
font-size: 14px;
line-height: 20px;
margin-bottom: 10px;
display: inline-block;
margin-left: 0;
}
.cancel {
text-decoration: underline;
display: block;
margin-right: 5px;
}
}
}
.modal-footer .cancel-inline {
text-decoration: underline;
margin-left: 10px;
}
.permission-list{
list-style:none;
margin: 0 0 30px;
padding: 0;
.name {
margin-right: 20px;
display: inline-block;
min-width: 100px;
}
.permission {
margin-left: 20px;
}
.fa-times-circle {
margin-left: 5px;
}
li {
margin-bottom: 10px;
}
}

View File

@ -1,15 +1,3 @@
.add-upload .fa-plus {
font-size: 10px;
position: relative;
left: -5px;
bottom: -5px;
text-shadow:
-1px -1px 0 $btn-primary-background-color,
1px 1px 0 $btn-primary-background-color,
1px -1px 0 $btn-primary-background-color,
-1px 1px 0 $btn-primary-background-color;
}
.upload-selector {
label {
display: inline-block;

View File

@ -101,29 +101,6 @@
margin: 20px 0 10px 0;
}
.map {
height: 50px;
}
.avatar {
float: left;
width: 45px;
}
nav.buttons {
width: 180px;
padding: 0;
.btn {
width: 100%;
margin-bottom: 5px;
@include box-sizing(border-box);
}
}
h2 {
a {
font-size: 14px;
color: $link_color;
cursor: pointer;
}
}
}
.user-main {
@ -372,38 +349,3 @@
}
}
}
// styling of bottom section
.user-stream .child-actions {
margin-top: 8px;
.avatar-link {
float: none;
}
.fa {
width: 15px;
display: inline-block;
color: $secondary_text_color;
}
.avatar-wrapper {
border: none;
}
.avatar-link {
margin-right: 3px;
}
}
.avatar-selector {
label {
display: inline-block;
margin-right: 10px;
}
#avatar-input {
width: 0;
height: 0;
overflow: hidden;
}
.avatar {
margin: 5px 10px 5px 0;
}
}

View File

@ -13,38 +13,7 @@ display: none;
display: none;
}
.autocomplete {
z-index: 999999;
position: absolute;
width: 240px;
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
ul {
list-style: none;
padding: 0;
margin: 0;
li {
border-bottom: 1px solid $primary_border_color;
a[href] {
padding: 5px;
display: block;
span.username {
color: lighten($primary_text_color, 20%);
}
span.name {
font-size: 11px;
}
&.selected {
background-color: lighten($secondary_background_color, 60%);
}
@include hover {
background-color: lighten($secondary_background_color, 60%);
text-decoration: none;
}
}
}
}
}
#reply-control {
.toggle-preview, #draft-status, #file-uploading, .mobile-file-upload {
@ -287,61 +256,6 @@ display: none;
}
}
div.ac-wrap.disabled {
input {
display:none;
}
.item a {
display:none;
}
}
div.ac-wrap {
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
padding: 5px 10px;
@include border-radius-all(3px);
div.item {
float: left;
margin-right: 10px;
margin-bottom: 5px;
span {
padding-left: 5px;
height: 22px;
display: inline-block;
line-height: 22px;
vertical-align: bottom;
}
a {
margin-left: 4px;
font-size: 10px;
line-height: 10px;
padding: 2px 1px 1px 3px;
border-radius: 10px;
width: 10px;
display: inline-block;
border: 1px solid rgba(255, 255, 255, 0);
&:hover {
background-color: $warning_background_color;
border: 1px solid $warning_border_color;
text-decoration: none;
color: $emphasis_text_color;
}
}
}
input[type="text"] {
float: left;
margin-top: 5px;
border: 0;
padding: 0;
margin: 4px 0 0;
box-shadow: none;
font-size: 16px;
}
}
#reply-control.edit-title.private-message {
.wmd-controls {
@include transition(top 0.3s ease);
@ -349,13 +263,7 @@ div.ac-wrap {
}
}
#reply-control.topic #wmd-quote-post {
display: none;
}
#reply-control {
&.hide-preview {
.wmd-controls {
#wmd-input {
@ -454,34 +362,3 @@ div.ac-wrap {
z-index: 100;
}
}
@media screen and (min-width: 1550px) {
#reply-control {
.wmd-controls {
width: 1450px;
left: auto;
right: auto;
}
}
}
.auto-close-fields {
input {
width: 50px;
}
}
.edit-auto-close-modal {
form {
margin: 0;
}
.auto-close-fields {
i.fa-clock-o {
font-size: 16px;
line-height: 8px;
}
input {
margin: 0;
}
}
}

View File

@ -16,63 +16,8 @@ body {
margin-left: 12px;
}
a.no-href {
cursor: pointer;
}
body {
button.ok {
background: $success_background_color;
color: $emphasis_text_color;
@include hover {
background: darken($success_background_color, 10%);
color: $emphasis_text_color;
}
}
button.cancel {
background: $warning_background_color;
color: $emphasis_text_color;
@include hover {
background: $warning_background_color;
color: $emphasis_text_color;
}
}
.coldmap-high {
color: $coldmap-high !important;
}
.coldmap-med {
color: $coldmap-med !important;
}
.coldmap-low {
color: $coldmap-low !important;
}
.heatmap-high {
color: $heatmap-high !important;
}
.heatmap-med {
color: $heatmap-med !important;
}
.heatmap-low {
color: $heatmap-low !important;
}
#loading-message {
position: absolute;
font-size: 30px;
text-align: center;
top: 120px;
left: 500px;
color: $secondary_text_color;
}
.top-space {
margin-top: 10px;
}
ul.breadcrumb {
margin: 0 10px 0 10px;
}
.boxed {
height: 100%;
@include border-radius-all(5px);
@ -138,44 +83,10 @@ body {
}
}
}
.message {
@include border-radius-all(8px);
background-color: $primary_background_color;
padding: 14px;
h2 {
margin-bottom: 20px;
}
p {
font-size: 20px;
}
}
#footer {
.container {
height: 50px;
.contents {
padding-top: 10px;
a[href] {
color: $primary_background_color;
}
}
}
}
.clear-transitions {
@include transition(none !important);
}
}
form {
.tip {
display: inline-block;
&.good {
color: $success_text_color;
}
&.bad {
color: $warning_text_color;
}
}
}
blockquote {
/* 13px left is intentional here to properly align with post quotes */
@ -201,61 +112,3 @@ blockquote {
}
}
}
#wmd-input {
resize: none;
}
#pagedown-editor {
width: 540px;
background-color: $primary_background_color;
padding: 0 10px 13px 10px;
border: 1px solid $primary_border_color;
.preview {
margin-top: 8px;
border: 1px dashed $primary_border_color;
padding: 8px 8px 0 8px;
p {
margin: 0 0 10px 0;
}
}
.preview.hidden {
display: none;
}
}
.spinner {
width: 100px;
margin: 0 auto 30px auto;
background-color: $secondary_background_color;
@include border-radius-all(10px);
padding: 10px 10px 10px 30px;
font-size: 15px;
line-height: 23px;
text-align: center;
color: $tertiary_text_color;
background: {
image: image-url("spinner_96_w.gif");
repeat: no-repeat;
position: 10px 8px;
size: 25px;
};
}
.avatar {
@include border-radius-all(2px);
}
.avatar-wrapper {
background-color: $primary_background_color;
display: inline-block;
border: 1px solid $primary_border_color;
@include border-radius-all(5px);
img {
@include border-radius-all(4px);
}
}
.profiler-results.profiler-left {
top: 60px !important;
}

View File

@ -1,641 +0,0 @@
/* Magnific Popup CSS */
////////////////////////
//
// Contents:
//
// 1. Default Settings
// 2. General styles
// - Transluscent overlay
// - Containers, wrappers
// - Cursors
// - Helper classes
// 3. Appearance
// - Preloader & text that displays error messages
// - CSS reset for buttons
// - Close icon
// - "1 of X" counter
// - Navigation (left/right) arrows
// - Iframe content type styles
// - Image content type styles
// - Media query where size of arrows is reduced
// - IE7 support
//
////////////////////////
////////////////////////
// 1. Default Settings
////////////////////////
$overlay-color: #0b0b0b !default;
$overlay-opacity: 0.8 !default;
$shadow: 0 0 8px rgba(0, 0, 0, 0.6) !default; // shadow on image or iframe
$popup-padding-left: 8px !default; // Padding from left and from right side
$popup-padding-left-mobile: 6px !default; // Same as above, but is applied when width of window is less than 800px
$z-index-base: 1040 !default; // Base z-index of popup
$include-arrows: true !default; // include styles for nav arrows
$controls-opacity: 0.65 !default;
$controls-color: #FFF !default;
$inner-close-icon-color: #333 !default;
$controls-text-color: #CCC !default; // Color of preloader and "1 of X" indicator
$controls-text-color-hover: #FFF !default;
$IE7support: true !default; // Very basic IE7 support
// Iframe-type options
$include-iframe-type: true !default;
$iframe-padding-top: 40px !default;
$iframe-background: #000 !default;
$iframe-max-width: 900px !default;
$iframe-ratio: 9/16 !default;
// Image-type options
$include-image-type: true !default;
$image-background: #444 !default;
$image-padding-top: 40px !default;
$image-padding-bottom: 40px !default;
$include-mobile-layout-for-image: true !default; // Removes paddings from top and bottom
// Image caption options
$caption-title-color: #F3F3F3 !default;
$caption-subtitle-color: #BDBDBD !default;
// A11y
$use-visuallyhidden: false !default; // Hide content from browsers, but make it available for screen readers
////////////////////////
// 2. General styles
////////////////////////
// Transluscent overlay
.mfp-bg {
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: $z-index-base + 2;
overflow: hidden;
position: fixed;
background: $overlay-color;
opacity: $overlay-opacity;
@if $IE7support {
filter: unquote("alpha(opacity=#{$overlay-opacity*100})");
}
}
// Wrapper for popup
.mfp-wrap {
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: $z-index-base + 3;
position: fixed;
outline: none !important;
-webkit-backface-visibility: hidden; // fixes webkit bug that can cause "false" scrollbar
}
// Root container
.mfp-container {
text-align: center;
position: absolute;
width: 100%;
height: 100%;
left: 0;
top: 0;
padding: 0 $popup-padding-left;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
// Vertical centerer helper
.mfp-container {
&:before {
content: '';
display: inline-block;
height: 100%;
vertical-align: middle;
}
}
// Remove vertical centering when popup has class `mfp-align-top`
.mfp-align-top {
.mfp-container {
&:before {
display: none;
}
}
}
// Popup content holder
.mfp-content {
position: relative;
display: inline-block;
vertical-align: middle;
margin: 0 auto;
text-align: left;
z-index: $z-index-base + 5;
}
.mfp-inline-holder,
.mfp-ajax-holder {
.mfp-content {
width: 100%;
cursor: auto;
}
}
// Cursors
.mfp-ajax-cur {
cursor: progress;
}
.mfp-zoom-out-cur {
&, .mfp-image-holder .mfp-close {
cursor: -moz-zoom-out;
cursor: -webkit-zoom-out;
cursor: zoom-out;
}
}
.mfp-zoom {
cursor: pointer;
cursor: -webkit-zoom-in;
cursor: -moz-zoom-in;
cursor: zoom-in;
}
.mfp-auto-cursor {
.mfp-content {
cursor: auto;
}
}
.mfp-close,
.mfp-arrow,
.mfp-preloader,
.mfp-counter {
-webkit-user-select:none;
-moz-user-select: none;
user-select: none;
}
// Hide the image during the loading
.mfp-loading {
&.mfp-figure {
display: none;
}
}
// Helper class that hides stuff
@if $use-visuallyhidden {
// From HTML5 Boilerplate https://github.com/h5bp/html5-boilerplate/blob/v4.2.0/doc/css.md#visuallyhidden
.mfp-hide {
border: 0 !important;
clip: rect(0 0 0 0) !important;
height: 1px !important;
margin: -1px !important;
overflow: hidden !important;
padding: 0 !important;
position: absolute !important;
width: 1px !important;
}
} @else {
.mfp-hide {
display: none !important;
}
}
////////////////////////
// 3. Appearance
////////////////////////
// Preloader and text that displays error messages
.mfp-preloader {
color: $controls-text-color;
position: absolute;
top: 50%;
width: auto;
text-align: center;
margin-top: -0.8em;
left: 8px;
right: 8px;
z-index: $z-index-base + 4;
a {
color: $controls-text-color;
&:hover {
color: $controls-text-color-hover;
}
}
}
// Hide preloader when content successfully loaded
.mfp-s-ready {
.mfp-preloader {
display: none;
}
}
// Hide content when it was not loaded
.mfp-s-error {
.mfp-content {
display: none;
}
}
// CSS-reset for buttons
button {
&.mfp-close,
&.mfp-arrow {
overflow: visible;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
display: block;
outline: none;
padding: 0;
z-index: $z-index-base + 6;
-webkit-box-shadow: none;
box-shadow: none;
}
&::-moz-focus-inner {
padding: 0;
border: 0
}
}
// Close icon
.mfp-close {
width: 44px;
height: 44px;
line-height: 44px;
position: absolute;
right: 0;
top: 0;
text-decoration: none;
text-align: center;
opacity: $controls-opacity;
@if $IE7support {
filter: unquote("alpha(opacity=#{$controls-opacity*100})");
}
padding: 0 0 18px 10px;
color: $controls-color;
font-style: normal;
font-size: 28px;
font-family: Arial, Baskerville, monospace;
&:hover,
&:focus {
opacity: 1;
@if $IE7support {
filter: unquote("alpha(opacity=#{1*100})");
}
}
&:active {
top: 1px;
}
}
.mfp-close-btn-in {
.mfp-close {
color: $inner-close-icon-color;
}
}
.mfp-image-holder,
.mfp-iframe-holder {
.mfp-close {
color: $controls-color;
right: -6px;
text-align: right;
padding-right: 6px;
width: 100%;
}
}
// "1 of X" counter
.mfp-counter {
position: absolute;
top: 0;
right: 0;
color: $controls-text-color;
font-size: 12px;
line-height: 18px;
}
// Navigation arrows
@if $include-arrows {
.mfp-arrow {
position: absolute;
opacity: $controls-opacity;
@if $IE7support {
filter: unquote("alpha(opacity=#{$controls-opacity*100})");
}
margin: 0;
top: 50%;
margin-top: -55px;
padding: 0;
width: 90px;
height: 110px;
-webkit-tap-highlight-color: rgba(0,0,0,0);
&:active {
margin-top: -54px;
}
&:hover,
&:focus {
opacity: 1;
@if $IE7support {
filter: unquote("alpha(opacity=#{1*100})");
}
}
&:before,
&:after,
.mfp-b,
.mfp-a {
content: '';
display: block;
width: 0;
height: 0;
position: absolute;
left: 0;
top: 0;
margin-top: 35px;
margin-left: 35px;
border: medium inset transparent;
}
&:after,
.mfp-a {
border-top-width: 13px;
border-bottom-width: 13px;
top:8px;
}
&:before,
.mfp-b {
border-top-width: 21px;
border-bottom-width: 21px;
}
}
.mfp-arrow-left {
left: 0;
&:after,
.mfp-a {
border-right: 17px solid #FFF;
margin-left: 31px;
}
&:before,
.mfp-b {
margin-left: 25px;
border-right: 27px solid #3f3f3f;
}
}
.mfp-arrow-right {
right: 0;
&:after,
.mfp-a {
border-left: 17px solid #FFF;
margin-left: 39px
}
&:before,
.mfp-b {
border-left: 27px solid #3f3f3f;
}
}
}
// Iframe content type
@if $include-iframe-type {
.mfp-iframe-holder {
padding-top: $iframe-padding-top;
padding-bottom: $iframe-padding-top;
.mfp-content {
line-height: 0;
width: 100%;
max-width: $iframe-max-width;
}
.mfp-close {
top: -40px;
}
}
.mfp-iframe-scaler {
width: 100%;
height: 0;
overflow: hidden;
padding-top: $iframe-ratio * 100%;
iframe {
position: absolute;
display: block;
top: 0;
left: 0;
width: 100%;
height: 100%;
box-shadow: $shadow;
background: $iframe-background;
}
}
}
// Image content type
@if $include-image-type {
/* Main image in popup */
img {
&.mfp-img {
width: auto;
max-width: 100%;
height: auto;
display: block;
line-height: 0;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: $image-padding-top 0 $image-padding-bottom;
margin: 0 auto;
}
}
/* The shadow behind the image */
.mfp-figure {
line-height: 0;
&:after {
content: '';
position: absolute;
left: 0;
top: $image-padding-top;
bottom: $image-padding-bottom;
display: block;
right: 0;
width: auto;
height: auto;
z-index: -1;
box-shadow: $shadow;
background: $image-background;
}
small {
color: $caption-subtitle-color;
display: block;
font-size: 12px;
line-height: 14px;
}
figure {
margin: 0;
}
}
.mfp-bottom-bar {
margin-top: -$image-padding-bottom + 4;
position: absolute;
top: 100%;
left: 0;
width: 100%;
cursor: auto;
}
.mfp-title {
text-align: left;
line-height: 18px;
color: $caption-title-color;
word-wrap: break-word;
padding-right: 36px; // leave some space for counter at right side
}
.mfp-image-holder {
.mfp-content {
max-width: 100%;
}
}
.mfp-gallery {
.mfp-image-holder {
.mfp-figure {
cursor: pointer;
}
}
}
@if $include-mobile-layout-for-image {
@media screen and (max-width: 800px) and (orientation:landscape), screen and (max-height: 300px) {
/**
* Remove all paddings around the image on small screen
*/
.mfp-img-mobile {
.mfp-image-holder {
padding-left: 0;
padding-right: 0;
}
img {
&.mfp-img {
padding: 0;
}
}
.mfp-figure {
/* The shadow behind the image */
&:after {
top: 0;
bottom: 0;
}
small {
display: inline;
margin-left: 5px;
}
}
.mfp-bottom-bar {
background: rgba(0,0,0,0.6);
bottom: 0;
margin: 0;
top: auto;
padding: 3px 5px;
position: fixed;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
&:empty {
padding: 0;
}
}
.mfp-counter {
right: 5px;
top: 3px;
}
.mfp-close {
top: 0;
right: 0;
width: 35px;
height: 35px;
line-height: 35px;
background: rgba(0, 0, 0, 0.6);
position: fixed;
text-align: center;
padding: 0;
}
}
}
}
}
// Scale navigation arrows and reduce padding from sides
@media all and (max-width: 900px) {
.mfp-arrow {
-webkit-transform: scale(0.75);
transform: scale(0.75);
}
.mfp-arrow-left {
-webkit-transform-origin: 0;
transform-origin: 0;
}
.mfp-arrow-right {
-webkit-transform-origin: 100%;
transform-origin: 100%;
}
.mfp-container {
padding-left: $popup-padding-left-mobile;
padding-right: $popup-padding-left-mobile;
}
}
// IE7 support
// Styles that make popup look nicier in old IE
@if $IE7support {
.mfp-ie7 {
.mfp-img {
padding: 0;
}
.mfp-bottom-bar {
width: 600px;
left: 50%;
margin-left: -300px;
margin-top: 5px;
padding-bottom: 5px;
}
.mfp-container {
padding: 0;
}
.mfp-content {
padding-top: 44px;
}
.mfp-close {
top: 0;
right: 0;
padding-top: 0;
}
}
}

View File

@ -1,71 +1,12 @@
// base styles for every modal popup used in Discourse
.modal-open {
.dropdown-menu {
z-index: 2050;
}
.popover {
z-index: 2060;
}
.tooltip {
z-index: 2070;
}
}
.modal-open #main {overflow:hidden;}
.modal-backdrop {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1040;
background-color: $secondary_background_color;
&.fade {
opacity: 0;
}
}
.modal-backdrop,
.modal-backdrop.fade.in {
opacity: 0.8;
filter: alpha(opacity=80);
}
.modal-outer-container {
display:table;
width:100%;
height:100%;
}
.modal-middle-container {
margin-top: 10%;
max-width: 100%;
margin-bottom: 30px; // For iOS Safari issues
}
.modal-inner-container {
max-width: 100%;
margin: 0 auto;
background-color: $primary_background_color;
border: 1px solid $primary_border_color;
border: 1px solid rgba(0, 0, 0, 0.3);
@include border-radius-all (6px);
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
background-clip: padding-box;
}
.modal {
position: fixed;
top: 0;
width: 100%;
height: 100%;
z-index: 1050;
overflow: auto;
}
// Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
.bootbox.modal {
@ -97,24 +38,7 @@
max-height: 400px;
padding: 10px 15px 10px 15px;
}
.modal-form {
margin-bottom: 0;
}
.modal-footer {
margin: 0 15px;
padding: 14px 0 15px;
border-top: 1px solid #ddd;
@include border-radius-all(0 0 6px 6px);
@include box-shadow (inset 0 1px 0 rgba($primary_shadow_color, .8));
}
.modal-footer:before,
.modal-footer:after {
display: table;
content: "";
}
.modal-footer:after {
clear: both;
}
// an ember metamorph is inserted between btn's sometimes, breaking this rule, but only on mobile for some reason:
// .modal-footer .btn + .btn {
.modal-footer .btn {
@ -141,46 +65,7 @@
}
}
.modal {
.nav {
padding: 10px 30px;
background-color: lighten($secondary_background_color, 76%);
li > a {
font-size: 14px;
}
border-bottom: 1px solid $primary_border_color;
}
&.hidden {
display: none;
}
.modal-body {
textarea {
width: 99%;
height: 80px;
}
label {
color: $secondary_text_color;
}
p {
color: $primary_text_color;
font-size: 13px;
}
.archetype-option {
margin-bottom: 20px;
}
.warning {
color: $warning_text_color !important;
}
}
.password-confirmation {
display: none;
}
section.field {
margin-bottom: 20px;
}
}
#move-selected {
p {
@ -253,86 +138,3 @@
.modal-tab {
position: absolute;
}
.invite-modal {
overflow: visible;
.ember-text-field {
width: 550px;
}
}
.reply-where-modal {
width: 370px;
margin-left: -185px;
.modal-footer {
.btn {
text-align: left;
font-size: 18px;
line-height: 20px;
width: 310px;
margin-bottom: 10px;
display: block;
margin-left: 0;
.topic-title {
font-size: 13px;
font-weight: normal;
}
&.btn-reply-here {
background: lighten($secondary_background_color, 60%);
text-shadow: none;
color: $secondary_text_color;
}
}
.cancel {
text-decoration: underline;
float: right;
margin-right: 5px;
}
}
}
.delete-user-modal {
.modal-footer {
.btn {
font-weight: normal;
text-align: left;
font-size: 14px;
line-height: 20px;
margin-bottom: 10px;
display: inline-block;
margin-left: 0;
}
.cancel {
text-decoration: underline;
display: block;
margin-right: 5px;
}
}
}
.flagging-delete-spammer, .delete-all-posts {
.modal-footer .cancel {
text-decoration: underline;
margin-left: 10px;
}
}
.permission-list{
list-style:none;
margin: 0 0 30px;
padding: 0;
.name {
margin-right: 20px;
display: inline-block;
min-width: 100px;
}
.permission {
margin-left: 20px;
}
.fa-times-circle {
margin-left: 5px;
}
li {
margin-bottom: 10px;
}
}

View File

@ -1,14 +1,3 @@
.add-upload .fa-plus {
font-size: 10px;
position: relative;
left: -5px;
bottom: -5px;
text-shadow: -1px -1px 0 $btn-primary-background-color,
1px 1px 0 $btn-primary-background-color,
1px -1px 0 $btn-primary-background-color,
-1px 1px 0 $btn-primary-background-color;
}
.upload-selector {
input[type="text"]{
width: 520px;

View File

@ -96,31 +96,7 @@
border-left: 0;
border-right: 0;
}
.map {
height: 50px;
}
.avatar {
float: left;
width: 45px;
background-color: $primary_background_color;
}
nav.buttons {
width: 180px;
padding: 0;
.btn {
width: 100%;
margin-bottom: 5px;
@include box-sizing(border-box);
}
}
h2 {
a {
font-size: 14px;
color: $secondary_text_color;
cursor: pointer;
}
}
}
.user-main {
@ -275,38 +251,3 @@
}
}
}
// styling of bottom section
.user-stream .child-actions {
margin-top: 8px;
.avatar-link {
float: none;
}
.fa {
width: 15px;
display: inline-block;
color: lighten($primary_text_color, 35%);
}
.avatar-wrapper {
border: none;
}
.avatar-link {
margin-right: 3px;
}
}
.avatar-selector {
label {
display: inline-block;
margin-right: 10px;
}
#avatar-input {
width: 0;
height: 0;
overflow: hidden;
}
.avatar {
margin: 5px 10px 5px 0;
}
}