mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6341 from nextcloud/jquery-ui-scss 

Use SCSS for jquery-ui-fixes
This commit is contained in:
Morris Jobke 2017-09-03 20:25:25 +02:00 committed by GitHub
parent 0f71e3fba2 92a440a0b5
commit 27644c7502
7 changed files with 85 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 157 B

BIN
core/css/images/ui-bg_flat_100_ffffff_40x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 86 B

BIN
core/css/images/ui-bg_glass_100_f8f8f8_1x400.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 105 B

BIN
core/css/images/ui-bg_highlight-hard_100_f8f8f8_1x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 88 B

BIN
core/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 90 B

29
core/css/inputs.scss
View File

@ -468,35 +468,6 @@ input {
} }
} }
/* Select menus - TODO: move to jquery-ui-fixes.css
----------------------------------*/
.ui-menu {
padding: 0;
.ui-menu-item a {
&.ui-state-focus, &.ui-state-active {
font-weight: inherit;
margin: 0;
}
}
}
.ui-widget-content {
background: $color-main-background;
border-top: none;
}
.ui-corner-all {
border-radius: 0;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
border: 1px solid transparent;
background: inherit;
color: $color-primary;
}
/* Animation */ /* Animation */
@keyframes shake { @keyframes shake {
10%, 10%,

117
core/css/jquery-ui-fixes.css → core/css/jquery-ui-fixes.scss
View File

@ -1,27 +1,19 @@
/* Component containers /* Component containers
----------------------------------*/ ----------------------------------*/
.ui-widget {
font-family: "Lucida Grande", Arial, Verdana, sans-serif;
font-size: 1em;
}
.ui-widget button {
font-family: "Lucida Grande", Arial, Verdana, sans-serif;
}
.ui-widget-content { .ui-widget-content {
border: 1px solid #dddddd; border: 1px solid nc-darken($color-main-background, 20%);
background: #eeeeee url('images/ui-bg_highlight-soft_100_eeeeee_1x100.png') 50% top repeat-x; background: $color-main-background none;
color: #333333; color: $color-main-text;
} }
.ui-widget-content a { .ui-widget-content a {
color: #333333; color: $color-main-text;
} }
.ui-widget-header { .ui-widget-header {
border: 1px solid #0082c9; border: none;
background: #0082c9; color: $color-main-text;
color: #ffffff;
} }
.ui-widget-header a { .ui-widget-header a {
color: #ffffff; color: $color-main-text;
} }
/* Interaction states /* Interaction states
@ -29,8 +21,8 @@
.ui-state-default, .ui-state-default,
.ui-widget-content .ui-state-default, .ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default { .ui-widget-header .ui-state-default {
border: 1px solid #ddd; border: 1px solid nc-darken($color-main-background, 20%);
background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x; background: $color-main-background none;
font-weight: bold; font-weight: bold;
color: #555; color: #555;
} }
@ -46,28 +38,28 @@
.ui-widget-content .ui-state-focus, .ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus { .ui-widget-header .ui-state-focus {
border: 1px solid #ddd; border: 1px solid #ddd;
background: #ffffff url('images/ui-bg_flat_100_ffffff_40x100.png') 50% 50% repeat-x; background: $color-main-background none;
font-weight: bold; font-weight: bold;
color: #333; color: $color-main-text;
} }
.ui-state-hover a, .ui-state-hover a,
.ui-state-hover a:hover, .ui-state-hover a:hover,
.ui-state-hover a:link, .ui-state-hover a:link,
.ui-state-hover a:visited { .ui-state-hover a:visited {
color: #333; color: $color-main-text;
} }
.ui-state-active, .ui-state-active,
.ui-widget-content .ui-state-active, .ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active { .ui-widget-header .ui-state-active {
border: 1px solid #0082c9; border: 1px solid $color-primary;
background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x; background: $color-main-background none;
font-weight: bold; font-weight: bold;
color: #0082c9; color: $color-main-text;
} }
.ui-state-active a, .ui-state-active a,
.ui-state-active a:link, .ui-state-active a:link,
.ui-state-active a:visited { .ui-state-active a:visited {
color: #0082c9; color: $color-main-text;
} }
/* Interaction Cues /* Interaction Cues
@ -75,20 +67,20 @@
.ui-state-highlight, .ui-state-highlight,
.ui-widget-content .ui-state-highlight, .ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight { .ui-widget-header .ui-state-highlight {
border: 1px solid #ddd; border: 1px solid $color-main-background;
background: #f8f8f8 url('images/ui-bg_highlight-hard_100_f8f8f8_1x100.png') 50% top repeat-x; background: $color-main-background none;
color: #555; color: nc-lighten($color-main-text, 30%);
} }
.ui-state-highlight a, .ui-state-highlight a,
.ui-widget-content .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,
.ui-widget-header .ui-state-highlight a { .ui-widget-header .ui-state-highlight a {
color: #555; color: nc-lighten($color-main-text, 30%);
} }
.ui-state-error, .ui-state-error,
.ui-widget-content .ui-state-error, .ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error { .ui-widget-header .ui-state-error {
border: 1px solid #cd0a0a; border: $color-error;
background: #b81900 url('images/ui-bg_diagonals-thick_18_b81900_40x40.png') 50% 50% repeat; background: $color-error none;
color: #ffffff; color: #ffffff;
} }
.ui-state-error a, .ui-state-error a,
@ -137,6 +129,67 @@
border-radius: 5px; border-radius: 5px;
} }
.ui-menu .ui-menu-item a { /* Tabs customizations */
padding: 6px; .ui-tabs {
border: none;
.ui-tabs-nav.ui-corner-all {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.ui-tabs-nav {
background: none;
margin-bottom: 15px;
.ui-state-default {
border: none;
border-bottom: 1px solid transparent;
font-weight: normal;
margin: 0 !important;
padding: 0 !important;
}
.ui-state-hover,
.ui-state-active {
border: none;
border-bottom: 1px solid $color-main-text;
color: $color-main-text;
a, a:link, a:hover, a:visited {
color: $color-main-text;
}
}
.ui-state-active {
font-weight: bold;
}
}
}
/* Select menus */
.ui-autocomplete {
&.ui-menu {
padding: 0;
.ui-menu-item a {
&.ui-state-focus, &.ui-state-active {
font-weight: inherit;
}
}
}
&.ui-widget-content {
background: $color-main-background;
border-top: none;
}
&.ui-corner-all {
border-radius: 0;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
border: 1px solid transparent;
background: inherit;
color: $color-primary;
}
} }