Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use SCSS for jquery-ui-fixes #6341

Merged
merged 3 commits into from
Sep 3, 2017
+85 −61
Merged

Use SCSS for jquery-ui-fixes #6341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fdc51f
Use SCSS for jquery-ui-fixes
juliushaertl Sep 2, 2017
99404fe
Remove unnecessary files for jquery-ui-fixes
juliushaertl Sep 2, 2017
92a440a
Fix font color
MorrisJobke Sep 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
View file
Open in desktop
Binary file not shown.
Binary file removed core/css/images/ui-bg_flat_100_ffffff_40x100.png
View file
Open in desktop
Binary file not shown.
Binary file removed core/css/images/ui-bg_glass_100_f8f8f8_1x400.png
View file
Open in desktop
Binary file not shown.
Binary file removed core/css/images/ui-bg_highlight-hard_100_f8f8f8_1x100.png
View file
Open in desktop
Binary file not shown.
Binary file removed core/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
View file
Open in desktop
Binary file not shown.
29 changes: 0 additions & 29 deletions core/css/inputs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
@keyframes shake {
10%,
Expand Down
117 changes: 85 additions & 32 deletions core/css/jquery-ui-fixes.css → core/css/jquery-ui-fixes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,28 @@
/* 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 {
border: 1px solid #dddddd;
background: #eeeeee url('images/ui-bg_highlight-soft_100_eeeeee_1x100.png') 50% top repeat-x;
color: #333333;
border: 1px solid nc-darken($color-main-background, 20%);
background: $color-main-background none;
color: $color-main-text;
}
.ui-widget-content a {
color: #333333;
color: $color-main-text;
}
.ui-widget-header {
border: 1px solid #0082c9;
background: #0082c9;
color: #ffffff;
border: none;
color: $color-main-text;
}
.ui-widget-header a {
color: #ffffff;
color: $color-main-text;
}

/* Interaction states
----------------------------------*/
.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
border: 1px solid #ddd;
background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x;
border: 1px solid nc-darken($color-main-background, 20%);
background: $color-main-background none;
font-weight: bold;
color: #555;
}
Expand All @@ -46,49 +38,49 @@
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
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;
color: #333;
color: $color-main-text;
}
.ui-state-hover a,
.ui-state-hover a:hover,
.ui-state-hover a:link,
.ui-state-hover a:visited {
color: #333;
color: $color-main-text;
}
.ui-state-active,
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
border: 1px solid #0082c9;
background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x;
border: 1px solid $color-primary;
background: $color-main-background none;
font-weight: bold;
color: #0082c9;
color: $color-main-text;
}
.ui-state-active a,
.ui-state-active a:link,
.ui-state-active a:visited {
color: #0082c9;
color: $color-main-text;
}

/* Interaction Cues
----------------------------------*/
.ui-state-highlight,
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
border: 1px solid #ddd;
background: #f8f8f8 url('images/ui-bg_highlight-hard_100_f8f8f8_1x100.png') 50% top repeat-x;
color: #555;
border: 1px solid $color-main-background;
background: $color-main-background none;
color: nc-lighten($color-main-text, 30%);
}
.ui-state-highlight a,
.ui-widget-content .ui-state-highlight a,
.ui-widget-header .ui-state-highlight a {
color: #555;
color: nc-lighten($color-main-text, 30%);
}
.ui-state-error,
.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error {
border: 1px solid #cd0a0a;
background: #b81900 url('images/ui-bg_diagonals-thick_18_b81900_40x40.png') 50% 50% repeat;
border: $color-error;
background: $color-error none;
color: #ffffff;
}
.ui-state-error a,
Expand Down Expand Up @@ -137,6 +129,67 @@
border-radius: 5px;
}

.ui-menu .ui-menu-item a {
padding: 6px;
/* Tabs customizations */
.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;
}
}