mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 00:29:18 +08:00
ada1d6b987
* composer restyle, some input normalization
* style adjustments: spacing, preview background, colors
* small spacing adjustments, removing default iOS input appearance, fixing merge
* small width adjustment
* fixing mobile link modal for small devices
* FIX: more resilient allowInitiatlValueMutation implementation
* Build scrollMap only on scroll.
* FIX: pick date and time was not reseting state
* FIX: removes auto sizing and touchstart support for now
* Revert "FIX: reflects discourse icons naming scheme s/d-icon-*/d-*"
This reverts commit b5ed980235
.
* tweak icon-library generation
* FIX: regression preventing to set number of hours before closing
This commit also adds a full test suite for editing topic timer.
* FIX: makes allowInitialValueMutation more restrictive
* FIX: invite-list expects initial value mutation
* fixing tag input spacing
* minor input cleanup
* bump onebox version
* FIX: avoids test failing at some times of the day
* FIX: various issues when editing category permissions
This commit also adds multiple tests
443 lines
5.9 KiB
SCSS
443 lines
5.9 KiB
SCSS
// Desktop
|
|
// global styles that apply to the Discourse application specifically
|
|
// BEWARE: changing these styles implies they take effect anywhere they are seen
|
|
// throughout the Discourse application
|
|
|
|
// Base Elements
|
|
body.widget-dragging {
|
|
cursor: ns-resize;
|
|
}
|
|
|
|
header {
|
|
margin-bottom: 15px;
|
|
}
|
|
|
|
// Common classes
|
|
.boxed {
|
|
height: 100%;
|
|
}
|
|
|
|
.topic-statuses {
|
|
float: left;
|
|
padding: 0;
|
|
|
|
.topic-status {
|
|
padding: 0 2px 0 0;
|
|
margin: 0;
|
|
|
|
i {
|
|
font-size: 1.071em;
|
|
}
|
|
}
|
|
|
|
.d-icon-envelope {
|
|
color: $danger;
|
|
}
|
|
}
|
|
|
|
|
|
.form-vertical {
|
|
.control-group {
|
|
margin-bottom: 24px;
|
|
}
|
|
}
|
|
|
|
|
|
/***********************/
|
|
/* bootstrap carryover */
|
|
/***********************/
|
|
code,
|
|
pre {
|
|
font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
|
|
}
|
|
|
|
// this removes the unwanted top margin on a paragraph under a heading
|
|
h1,
|
|
h2,
|
|
h3,
|
|
h4,
|
|
h5,
|
|
h6 {
|
|
+ p {
|
|
margin-top:0px;
|
|
}
|
|
}
|
|
|
|
form {
|
|
margin: 0 0 18px;
|
|
}
|
|
|
|
label,
|
|
input,
|
|
button,
|
|
select,
|
|
textarea {
|
|
font-size: 0.929em;
|
|
font-weight: normal;
|
|
line-height: 18px;
|
|
}
|
|
|
|
input,
|
|
button,
|
|
select,
|
|
textarea {
|
|
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
|
}
|
|
|
|
select,
|
|
textarea {
|
|
display: inline-block;
|
|
padding: 4px;
|
|
margin-bottom: 9px;
|
|
font-size: 0.929em;
|
|
line-height: 18px;
|
|
color: $primary;
|
|
}
|
|
|
|
input, textarea {
|
|
width: 210px;
|
|
}
|
|
|
|
select,
|
|
input[type="file"] {
|
|
line-height: 28px;
|
|
}
|
|
|
|
select {
|
|
width: 220px;
|
|
&[multiple],
|
|
&[size] {
|
|
height: auto;
|
|
}
|
|
}
|
|
|
|
input,
|
|
textarea {
|
|
margin-left: 0;
|
|
}
|
|
|
|
input {
|
|
&[type="radio"],
|
|
&[type="checkbox"] {
|
|
&[disabled],
|
|
&[readonly] {
|
|
background-color: transparent;
|
|
}
|
|
}
|
|
}
|
|
|
|
.input {
|
|
&-xxlarge {
|
|
width: 530px;
|
|
}
|
|
|
|
&-prepend,
|
|
&-append {
|
|
margin-bottom: 5px;
|
|
|
|
input[class*="span"] {
|
|
display: inline-block;
|
|
}
|
|
|
|
input,
|
|
select {
|
|
position: relative;
|
|
margin-bottom: 0;
|
|
vertical-align: middle;
|
|
|
|
&:focus {
|
|
z-index: 2;
|
|
}
|
|
}
|
|
|
|
.add-on {
|
|
display: inline-block;
|
|
width: auto;
|
|
height: 18px;
|
|
min-width: 16px;
|
|
padding: 4px 5px;
|
|
font-weight: normal;
|
|
line-height: 18px;
|
|
text-align: center;
|
|
vertical-align: middle;
|
|
background-color: $secondary;
|
|
border: 1px solid $primary-low;
|
|
}
|
|
|
|
.add-on,
|
|
.btn {
|
|
margin-left: -1px;
|
|
border-radius: 0;
|
|
}
|
|
|
|
.active {
|
|
background-color: $danger-medium;
|
|
border-color: $danger;
|
|
}
|
|
}
|
|
|
|
&-prepend {
|
|
.add-on,
|
|
.btn {
|
|
margin-right: -1px;
|
|
|
|
&:first-child {
|
|
border-radius: 3px 0 0 3px;
|
|
}
|
|
}
|
|
}
|
|
|
|
&-append {
|
|
input,
|
|
select {
|
|
border-radius: 3px 0 0 3px;
|
|
}
|
|
|
|
.add-on,
|
|
.btn {
|
|
&:last-child {
|
|
border-radius: 0 3px 3px 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
.input-prepend.input-append {
|
|
input,
|
|
select {
|
|
border-radius: 0;
|
|
background-color: $primary-low;
|
|
border-color: $primary-low;
|
|
}
|
|
|
|
.add-on,
|
|
.btn {
|
|
&:first-child {
|
|
margin-right: -1px;
|
|
border-radius: 3px 0 0 3px;
|
|
}
|
|
}
|
|
|
|
.add-on,
|
|
.btn {
|
|
&:last-child {
|
|
margin-left: -1px;
|
|
border-radius: 0 3px 3px 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
.controls-dropdown {
|
|
margin-bottom: 10px;
|
|
}
|
|
|
|
.control-group {
|
|
margin-bottom: 9px;
|
|
|
|
&.warning,
|
|
&.error {
|
|
> label {
|
|
color: $danger;
|
|
}
|
|
|
|
.checkbox,
|
|
.radio,
|
|
input,
|
|
select,
|
|
textarea {
|
|
color: $danger;
|
|
border-color: $danger;
|
|
|
|
&:focus {
|
|
border-color: scale-color($danger, $lightness: -30%);
|
|
box-shadow: 0 0 6px $danger;
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
&.warning {
|
|
.input-prepend,
|
|
.input-append {
|
|
.add-on {
|
|
color: $danger;
|
|
background-color: $danger;
|
|
border-color: $danger;
|
|
}
|
|
}
|
|
}
|
|
|
|
&.error {
|
|
.input-prepend,
|
|
.input-append {
|
|
.add-on {
|
|
color: $danger;
|
|
background-color: $danger-medium;
|
|
border-color: scale-color($danger, $lightness: -20%);
|
|
}
|
|
}
|
|
}
|
|
|
|
&.success {
|
|
> label {
|
|
color: $success;
|
|
}
|
|
|
|
.checkbox,
|
|
.radio,
|
|
input,
|
|
select,
|
|
textarea {
|
|
color: $success;
|
|
border-color: $success;
|
|
|
|
&:focus {
|
|
border-color: $success;
|
|
box-shadow: 0 0 6px $success;
|
|
}
|
|
}
|
|
|
|
.input-prepend,
|
|
.input-append {
|
|
.add-on {
|
|
color: $success;
|
|
background-color: $success-low;
|
|
border-color: $success;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
.form-horizontal {
|
|
.hide {
|
|
display: none;
|
|
}
|
|
|
|
input,
|
|
textarea,
|
|
select,
|
|
.input-prepend,
|
|
.input-append {
|
|
display: inline-block;
|
|
margin-bottom: 0;
|
|
}
|
|
|
|
.control-group {
|
|
@include clearfix;
|
|
margin-bottom: 18px;
|
|
}
|
|
|
|
.control-indent {
|
|
margin-left: 20px;
|
|
margin-bottom: 10px;
|
|
}
|
|
|
|
.control-label {
|
|
float: left;
|
|
width: 140px;
|
|
text-align: right;
|
|
font-weight: bold;
|
|
}
|
|
|
|
.controls {
|
|
margin-left: 160px;
|
|
}
|
|
}
|
|
|
|
.bootbox.modal {
|
|
.modal-footer {
|
|
a.btn-primary {
|
|
color: $secondary;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* bootstrap columns */
|
|
.row {
|
|
@include clearfix;
|
|
}
|
|
|
|
.span {
|
|
&4 {
|
|
width: 196px;
|
|
margin-right: 12px;
|
|
float: left;
|
|
}
|
|
|
|
&6 {
|
|
width: 27.027%;
|
|
float: left;
|
|
}
|
|
|
|
&8 {
|
|
width: 404px;
|
|
float: left;
|
|
}
|
|
|
|
&10 {
|
|
width: 508px;
|
|
float: left;
|
|
}
|
|
|
|
&13 {
|
|
width: 59.8198%;
|
|
float: left;
|
|
}
|
|
|
|
&15 {
|
|
/* intentionally no width set here, do not add one */
|
|
margin-left: 12px;
|
|
float: left;
|
|
}
|
|
|
|
&24 {
|
|
width: 1236px;
|
|
float: left;
|
|
color: amarillo;
|
|
}
|
|
}
|
|
|
|
.offset {
|
|
&2 {
|
|
margin-left: 116px;
|
|
}
|
|
|
|
&1 {
|
|
margin-left: 64px;
|
|
}
|
|
}
|
|
|
|
// Special elements
|
|
#main {
|
|
a.star {
|
|
color: $secondary-medium;
|
|
|
|
&:before {
|
|
font-family: "FontAwesome";
|
|
content: "\f005";
|
|
}
|
|
|
|
@include hover {
|
|
opacity: 0.6;
|
|
}
|
|
|
|
&:active {
|
|
opacity: 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Media Queries
|
|
@media all
|
|
and (max-width : 570px) {
|
|
|
|
body {
|
|
min-width: 0;
|
|
}
|
|
|
|
.wrap,
|
|
.full-width {
|
|
min-width: 0;
|
|
}
|
|
}
|