updates for theming compatibility

This commit is contained in:
Andy Miller
2016-03-30 18:56:38 -06:00
parent 5fd564307d
commit bf8dcec7b4
23 changed files with 304 additions and 37 deletions

View File

@@ -1 +1,10 @@
{"version":3,"file":"fonts.css","sources":["fonts.scss","configuration/fonts/_support.scss"],"sourcesContent":["$fonts-default: 'Lato' !default;\n$fonts-header: 'Montserrat' !default;\n$fonts-mono: 'Inconsolata' !default;\n\n$font-definitions: (\n Montserrat: ('Montserrat-regular', 400) (null),\n Lato: ('Lato-300', 300) ('Lato-regular', 400) ('Lato-700', 700),\n Inconsolata: ('Inconsolata-regular', 400) ('Inconsolata-700', 700)\n);\n\n@import \"configuration/fonts/support\";\n\n\n\n\n","@mixin admin-font-faces($fonts) {\n @each $fontname, $weights in $fonts {\n @if $fontname == $fonts-default or\n $fontname == $fonts-header or\n $fontname == $fonts-mono {\n @each $fullname, $weight in $weights {\n @if $fullname != null {\n @font-face {\n font-family: '#{$fontname}';\n font-weight: $weight;\n font-style: normal;\n src: url('../fonts/#{$fullname}/#{$fullname}.eot');\n src: url('../fonts/#{$fullname}/#{$fullname}.eot?#iefix') format('embedded-opentype'),\n local('#{$fullname}'),\n url('../fonts/#{$fullname}/#{$fullname}.woff2') format('woff2'),\n url('../fonts/#{$fullname}/#{$fullname}.woff') format('woff'),\n url('../fonts/#{$fullname}/#{$fullname}.ttf') format('truetype'),\n url('../fonts/#{$fullname}/#{$fullname}.svg##{$fontname}') format('svg');\n }\n }\n }\n }\n }\n}\n\n@mixin body-fonts($font) {\n body, h5, h6,\n .badge, .note, .grav-mdeditor-preview,\n input, select, textarea, button, .selectize-input {\n font-family: \"#{$font}\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n }\n}\n\n@mixin header-fonts($font) {\n h1, h2, h3, h4,\n #admin-menu li, .form-tabs > label, .label {\n font-family: \"#{$font}\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n }\n}\n\n@mixin mono-fonts($font) {\n code, kbd, pre, samp,\n body .CodeMirror {\n font-family: \"#{$font}\", \"Monaco\", \"Consolas\", \"Lucida Console\", monospace !important;\n }\n}\n\n@include admin-font-faces($font-definitions);\n\n@each $font in $fonts-default {\n @include body-fonts($font);\n}\n\n@each $font in $fonts-header {\n @include header-fonts($font);\n}\n\n@each $font in $fonts-mono {\n @include mono-fonts($font);\n}\n\n\n\n\n"],"mappings":"ACOoB,UAAU,CACN,WAAW,CAAE,YAAc,CAC3B,WAAW,CDJI,GAAG,CCKlB,UAAU,CAAE,MAAO,CACnB,GAAG,CAAE,yDAAG,CACR,GAAG,CAAE,gEAAG,CAAkD,2BAAM,CAChE,2BAAK,CACL,2DAAG,CAA6C,eAAM,CACtD,0DAAG,CAA4C,cAAM,CACrD,yDAAG,CAA2C,kBAAM,CACpD,oEAAG,CAAwD,aAAM,CAVrE,UAAU,CACN,WAAW,CAAE,MAAc,CAC3B,WAAW,CDHZ,GAAG,CCIF,UAAU,CAAE,MAAO,CACnB,GAAG,CAAE,qCAAG,CACR,GAAG,CAAE,4CAAG,CAAkD,2BAAM,CAChE,iBAAK,CACL,uCAAG,CAA6C,eAAM,CACtD,sCAAG,CAA4C,cAAM,CACrD,qCAAG,CAA2C,kBAAM,CACpD,0CAAG,CAAwD,aAAM,CAVrE,UAAU,CACN,WAAW,CAAE,MAAc,CAC3B,WAAW,CDHU,GAAG,CCIxB,UAAU,CAAE,MAAO,CACnB,GAAG,CAAE,6CAAG,CACR,GAAG,CAAE,oDAAG,CAAkD,2BAAM,CAChE,qBAAK,CACL,+CAAG,CAA6C,eAAM,CACtD,8CAAG,CAA4C,cAAM,CACrD,6CAAG,CAA2C,kBAAM,CACpD,kDAAG,CAAwD,aAAM,CAVrE,UAAU,CACN,WAAW,CAAE,MAAc,CAC3B,WAAW,CDH4B,GAAG,CCI1C,UAAU,CAAE,MAAO,CACnB,GAAG,CAAE,qCAAG,CACR,GAAG,CAAE,4CAAG,CAAkD,2BAAM,CAChE,iBAAK,CACL,uCAAG,CAA6C,eAAM,CACtD,sCAAG,CAA4C,cAAM,CACrD,qCAAG,CAA2C,kBAAM,CACpD,0CAAG,CAAwD,aAAM,CAVrE,UAAU,CACN,WAAW,CAAE,aAAc,CAC3B,WAAW,CDFM,GAAG,CCGpB,UAAU,CAAE,MAAO,CACnB,GAAG,CAAE,2DAAG,CACR,GAAG,CAAE,kEAAG,CAAkD,2BAAM,CAChE,4BAAK,CACL,6DAAG,CAA6C,eAAM,CACtD,4DAAG,CAA4C,cAAM,CACrD,2DAAG,CAA2C,kBAAM,CACpD,uEAAG,CAAwD,aAAM,CAVrE,UAAU,CACN,WAAW,CAAE,aAAc,CAC3B,WAAW,CDF+B,GAAG,CCG7C,UAAU,CAAE,MAAO,CACnB,GAAG,CAAE,mDAAG,CACR,GAAG,CAAE,0DAAG,CAAkD,2BAAM,CAChE,wBAAK,CACL,qDAAG,CAA6C,eAAM,CACtD,oDAAG,CAA4C,cAAM,CACrD,mDAAG,CAA2C,kBAAM,CACpD,+DAAG,CAAwD,aAAM,CASrF,IAAI,CAAE,EAAE,CAAE,EAAE,CACZ,MAAM,CAAE,KAAK,CAAE,sBAAsB,CACrC,KAAK,CAAE,MAAM,CAAE,QAAQ,CAAE,MAAM,CAAE,gBAAgB,AAAC,CAC9C,WAAW,CAAE,MAAU,CAAE,WAAW,CAAE,QAAQ,CAAE,QAAQ,CAAE,OAAO,CAAE,UAAU,CAChF,AAID,EAAE,CAAE,EAAE,CAAE,EAAE,CAAE,EAAE,CACd,WAAW,CAAC,EAAE,CAAE,UAAU,CAAG,KAAK,CAAE,MAAM,AAAC,CACvC,WAAW,CAAE,YAAU,CAAE,WAAW,CAAE,QAAQ,CAAE,QAAQ,CAAE,OAAO,CAAE,UAAU,CAChF,AAID,IAAI,CAAE,GAAG,CAAE,GAAG,CAAE,IAAI,CACpB,IAAI,CAAC,WAAW,AAAC,CACb,WAAW,CAAE,aAAU,CAAE,QAAQ,CAAE,UAAU,CAAE,gBAAgB,CAAE,SAAS,CAAC,UAAU,CACxF","names":[],"sourceRoot":"/source/"} {
"version": 3,
"file": "fonts.css",
"sources": [
"../scss/fonts.scss",
"../scss/configuration/fonts/_support.scss"
],
"mappings": "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",
"names": []
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +1,9 @@
{"version":3,"file":"simple-fonts.css","sources":["simple-fonts.scss"],"sourcesContent":["body, h5, h6,\n.badge, .note, .grav-mdeditor-preview,\ninput, select, textarea, button, .selectize-input,\nh1, h2, h3, h4,\n#admin-menu li, .form-tabs > label, .label {\n font-family: \"Helvetica Neue\", \"Helvetica\", \"Tahoma\", \"Geneva\", \"Arial\", sans-serif;\n}\ncode, kbd, pre, samp,\nbody .CodeMirror {\n font-family: \"Monaco\", \"Consolas\", \"Lucida Console\", monospace;\n}\n"],"mappings":"AAAA,IAAI,CAAE,EAAE,CAAE,EAAE,CACZ,MAAM,CAAE,KAAK,CAAE,sBAAsB,CACrC,KAAK,CAAE,MAAM,CAAE,QAAQ,CAAE,MAAM,CAAE,gBAAgB,CACjD,EAAE,CAAE,EAAE,CAAE,EAAE,CAAE,EAAE,CACd,WAAW,CAAC,EAAE,CAAE,UAAU,CAAG,KAAK,CAAE,MAAM,AAAC,CACvC,WAAW,CAAE,sEAAuE,CACvF,AACD,IAAI,CAAE,GAAG,CAAE,GAAG,CAAE,IAAI,CACpB,IAAI,CAAC,WAAW,AAAC,CACb,WAAW,CAAE,iDAAkD,CAClE","names":[],"sourceRoot":"/source/"} {
"version": 3,
"file": "simple-fonts.css",
"sources": [
"../scss/simple-fonts.scss"
],
"mappings": "AAAA,AAAA,IAAI,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CACZ,AAAA,MAAM,CAAE,AAAA,KAAK,CAAE,AAAA,sBAAsB,CACrC,AAAA,KAAK,CAAE,AAAA,MAAM,CAAE,AAAA,QAAQ,CAAE,AAAA,MAAM,CAAE,AAAA,gBAAgB,CACjD,AAAA,EAAE,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CAAE,AAAA,EAAE,CACd,AAAY,WAAD,CAAC,EAAE,CAAE,AAAa,UAAH,CAAG,KAAK,CAAE,AAAA,MAAM,AAAC,CACvC,WAAW,CAAE,sEAAuE,CACvF,AACD,AAAA,IAAI,CAAE,AAAA,GAAG,CAAE,AAAA,GAAG,CAAE,AAAA,IAAI,CACpB,AAAK,IAAD,CAAC,WAAW,AAAC,CACb,WAAW,CAAE,iDAAkD,CAClE",
"names": []
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -97,7 +97,7 @@ $element-map: (
} }
} }
$form-border: darken($content-bg,10%); $form-border: darken($content-bg,12%);
$form-border-width: 1px; $form-border-width: 1px;
// Core // Core
@@ -293,8 +293,8 @@ tr {
} }
} }
} }
a { a, i {
color: shade($logo-link, 20%); color: shade($logo-link, 10%);
&:hover { &:hover {
color: $logo-link; color: $logo-link;
} }
@@ -418,10 +418,20 @@ tr {
} }
} }
.sidebar-mobile-open {
#admin-main {
.lines-button {
.lines, .lines:before, .lines:after {
background: $logo-link;
}
}
}
}
#admin-dashboard { #admin-dashboard {
.primary-accent { .primary-accent {
@include linear-gradient(shade($primary-accent-bg, 20%), tint($primary-accent-bg, 30%)); @include linear-gradient(darken($primary-accent-bg, 7%), $primary-accent-bg);
p { p {
color: rgba($primary-accent-fg, 0.95); color: rgba($primary-accent-fg, 0.95);
@@ -443,7 +453,7 @@ tr {
} }
.secondary-accent { .secondary-accent {
@include linear-gradient(shade($secondary-accent-bg, 20%), tint($secondary-accent-bg, 30%)); @include linear-gradient(darken($secondary-accent-bg, 7%), $secondary-accent-bg);
p { p {
color: rgba($secondary-accent-fg, 0.95); color: rgba($secondary-accent-fg, 0.95);
@@ -723,11 +733,11 @@ form {
} }
.primary-accent { .primary-accent {
background: shade($primary-accent-bg, 20%); background: darken($primary-accent-bg, 5%);
color: $primary-accent-fg; color: $primary-accent-fg;
.button-bar { .button-bar {
background: shade($primary-accent-bg, 20%); background: darken($primary-accent-bg, 7%);
} }
.button { .button {
@@ -736,11 +746,11 @@ form {
} }
.secondary-accent { .secondary-accent {
background: shade($secondary-accent-bg, 15%); background: darken($secondary-accent-bg, 5%);
color: $secondary-accent-fg; color: $secondary-accent-fg;
.button-bar { .button-bar {
background: shade($secondary-accent-bg, 15%); background: darken($secondary-accent-bg, 7%);
} }
.button { .button {
@@ -1103,6 +1113,24 @@ body .selectize-dropdown .optgroup-header {
background-color: #fafafa; background-color: #fafafa;
} }
body .bootstrap-datetimepicker-widget {
&.dropdown-menu {
border-color: $form-border;
}
table {
td span:hover, th:hover, td.day:hover {
background: darken($content-bg, 5%) !important;
}
.active {
color: $content-link !important;
&:hover {
color: darken($content-link, 10%);
}
}
}
}
#phpinfo { #phpinfo {
th { th {
background: #d9d9d9; background: #d9d9d9;

View File

@@ -143,6 +143,7 @@ $sidebar-padding: 2rem;
width: 100%; width: 100%;
max-height: 100vh; max-height: 100vh;
opacity: 0; opacity: 0;
z-index: 3;
//transition: opacity 0.2s 0s, visibility 0s 0.2s; //transition: opacity 0.2s 0s, visibility 0s 0.2s;
#open-handle { #open-handle {

View File

@@ -18,8 +18,7 @@
} }
> .button { > .button {
position: relative;
float: left;
} }
// toggle caret // toggle caret
@@ -39,7 +38,7 @@
} }
.button + .button, .button + .button-group, .button-group + .button, .button-group + .button-group { .button + .button, .button + .button-group, .button-group + .button, .button-group + .button-group {
margin-left: -1px; margin-left: -3px;
} }
.dropdown-menu { .dropdown-menu {

View File

@@ -1,5 +1,5 @@
.default-animation { .default-animation {
@include transition(all 0.5s ease); @include transition(all 0.5s ease);
} }
.default-border-radius { .default-border-radius {
@@ -11,9 +11,8 @@
} }
.default-box-shadow { .default-box-shadow {
box-shadow: 0 10px 20px rgba(0,0,0,0.2); box-shadow: 0 0 0px 1px rgba(0,0,0,0.03);
} }
.padding-horiz { .padding-horiz {
padding-left: $padding-horiz; padding-left: $padding-horiz;
padding-right: $padding-horiz; padding-right: $padding-horiz;

View File

@@ -100,7 +100,7 @@
} }
#page-filtering { #page-filtering {
margin: -2rem $padding-default 1rem; margin: 0 $padding-default 1rem;
@include clearfix; @include clearfix;
@include breakpoint(mobile-only) { @include breakpoint(mobile-only) {

View File

@@ -41,7 +41,7 @@ $tab-label-height:3.5em;
} }
.form-tabs { .form-tabs {
margin-top: -4rem; margin-top: -2rem;
@include breakpoint(mobile-only){ @include breakpoint(mobile-only){
padding-top: 4rem; padding-top: 4rem;

View File

@@ -5,6 +5,7 @@
-webkit-font-smoothing: auto; -webkit-font-smoothing: auto;
cursor: pointer; cursor: pointer;
vertical-align: middle; vertical-align: middle;
outline: none;
&:active { &:active {
margin: 1px 0 -1px 0; margin: 1px 0 -1px 0;

View File

@@ -26,7 +26,7 @@
{% block messages %}{% endblock %} {% block messages %}{% endblock %}
{% block content_top %} {% block widgets %}
<div id="admin-dashboard"> <div id="admin-dashboard">
{% if grav.twig.plugins_hooked_dashboard_widgets_top %} {% if grav.twig.plugins_hooked_dashboard_widgets_top %}
{% for widget in grav.twig.plugins_hooked_dashboard_widgets_top %} {% for widget in grav.twig.plugins_hooked_dashboard_widgets_top %}

View File

@@ -203,7 +203,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="admin-block clear"> <div class="clear">
{% include 'partials/messages.html.twig' %} {% include 'partials/messages.html.twig' %}
{% if mode == 'new' %} {% if mode == 'new' %}
{% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('pages/page'), data: context } %} {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('pages/page'), data: context } %}

View File

@@ -49,7 +49,8 @@
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content-padding"> <div class="content-padding">
<div> {% block widgets %}{% endblock %}
<div class="default-box-shadow">
{% block messages %} {% block messages %}
{% include 'partials/messages.html.twig' %} {% include 'partials/messages.html.twig' %}
{% endblock %} {% endblock %}

View File

@@ -2,7 +2,7 @@
{% set backup = admin.lastBackup() %} {% set backup = admin.lastBackup() %}
<div id="updates" class="dashboard-item dashboard-left"> <div id="updates" class="dashboard-item dashboard-left">
<div class="secondary-accent"> <div class="secondary-accent default-box-shadow">
<h1>{{ "PLUGIN_ADMIN.MAINTENANCE"|tu }}</h1> <h1>{{ "PLUGIN_ADMIN.MAINTENANCE"|tu }}</h1>
<div class="admin-update-charts"> <div class="admin-update-charts">
<div class="updates-chart" data-chart-name="updates" data-chart-type="pie" data-chart-data="{{ {'series': [100, 0]}|json_encode|e('html_attr') }}"> <div class="updates-chart" data-chart-name="updates" data-chart-type="pie" data-chart-data="{{ {'series': [100, 0]}|json_encode|e('html_attr') }}">

View File

@@ -1,6 +1,6 @@
{% if authorize(['admin.statistics', 'admin.super']) %} {% if authorize(['admin.statistics', 'admin.super']) %}
<div id="popularity" class="dashboard-item dashboard-right" data-chart-name="popularity" data-chart-type="bar" data-chart-data="{{ {'series': [popularity.getDailyChartData['data']], 'labels': popularity.getDailyChartData['labels']}|json_encode|e('html_attr') }}"> <div id="popularity" class="dashboard-item dashboard-right" data-chart-name="popularity" data-chart-type="bar" data-chart-data="{{ {'series': [popularity.getDailyChartData['data']], 'labels': popularity.getDailyChartData['labels']}|json_encode|e('html_attr') }}">
<div class="primary-accent"> <div class="primary-accent default-box-shadow">
<h1>{{ "PLUGIN_ADMIN.STATISTICS"|tu }}</h1> <h1>{{ "PLUGIN_ADMIN.STATISTICS"|tu }}</h1>
<div class="admin-statistics-chart"> <div class="admin-statistics-chart">
<div class="ct-chart chart-loader"><i class="fa fa-refresh fa-spin"></i></div> <div class="ct-chart chart-loader"><i class="fa fa-refresh fa-spin"></i></div>

View File

@@ -2,7 +2,7 @@
{% block body %} {% block body %}
<body id="admin-login-wrapper"> <body id="admin-login-wrapper">
<section id="admin-login" class="{{ classes }}"> <section id="admin-login" class="default-box-shadow {{ classes }}">
<h1> <h1>
{{ title }} {{ title }}
</h1> </h1>