diff --git a/src/pretix/control/templates/pretixcontrol/event/base.html b/src/pretix/control/templates/pretixcontrol/event/base.html index 5bc7965e3..13bc8e58f 100644 --- a/src/pretix/control/templates/pretixcontrol/event/base.html +++ b/src/pretix/control/templates/pretixcontrol/event/base.html @@ -107,7 +107,7 @@ {% if 'can_view_vouchers' in request.eventpermset %}
  • + {% if "event.voucher" in url_name %}class="active"{% endif %}> {% trans "Vouchers" %} diff --git a/src/pretix/control/templates/pretixcontrol/order/index.html b/src/pretix/control/templates/pretixcontrol/order/index.html index 174e5d1e9..a8dd212da 100644 --- a/src/pretix/control/templates/pretixcontrol/order/index.html +++ b/src/pretix/control/templates/pretixcontrol/order/index.html @@ -12,48 +12,6 @@ {% endblock %} {% block content %} {% blocktrans asvar s_taxes %}taxes{% endblocktrans %} -

    - {% blocktrans trimmed with code=order.code %} - Order details: {{ code }} - {% endblocktrans %} - {% include "pretixcontrol/orders/fragment_order_status.html" with order=order class="pull-right" %} -

    - {% if 'can_change_orders' in request.eventpermset %} -
    - {% csrf_token %} - -
    - {% endif %} {% if order.is_expired_by_time %}
    @@ -68,13 +26,50 @@
    -
    -
    -

    - {% trans "Order details" %} -

    -
    +
    +

    + {% blocktrans trimmed with code=order.code %} + Order details: {{ code }} + {% endblocktrans %} + {% include "pretixcontrol/orders/fragment_order_status.html" with order=order class="pull-right" %} +

    + {% if 'can_change_orders' in request.eventpermset %} + + {% csrf_token %} + + + {% endif %}
    {% trans "Order code" %}
    {{ order.code }}
    diff --git a/src/pretix/static/pretixbase/scss/_theme.scss b/src/pretix/static/pretixbase/scss/_theme.scss index 8f4a6adf9..0e1d1e904 100644 --- a/src/pretix/static/pretixbase/scss/_theme.scss +++ b/src/pretix/static/pretixbase/scss/_theme.scss @@ -1,6 +1,26 @@ .sidebar-nav li > a > .fa { color: $navbar-inverse-bg; } +.sidebar-nav { + padding-top: 10px; +} +.sidebar-nav li > a { + padding: 7px 15px; +} +.sidebar-nav li li a { + padding-top: 2px; + padding-bottom: 2px; +} +.sidebar-nav li ul { + margin-bottom: 5px; +} +.sidebar-nav li.active > a, .sidebar-nav li a.active { + font-weight: bold; +} + +.panel h1, .panel h2 { + margin-top: 0; +} .btn { border-width: 0px; @@ -69,6 +89,14 @@ .alert-primary, .alert-warning, .alert-info, .alert-success, .alert-danger { color: #3b3b3b; } + +.panel { + box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07); +} +.panel-default > .panel-heading, .panel-default > .panel-footer { + background: white; +} + .panel-danger > .panel-heading, .panel-success > .panel-heading, .panel-default > .panel-heading, .panel-info > .panel-heading, .panel-warning > .panel-heading { color: #000000; } diff --git a/src/pretix/static/pretixbase/scss/_variables.scss b/src/pretix/static/pretixbase/scss/_variables.scss index 7733b80b6..ff4c21906 100644 --- a/src/pretix/static/pretixbase/scss/_variables.scss +++ b/src/pretix/static/pretixbase/scss/_variables.scss @@ -13,6 +13,8 @@ $gray-light: lighten(#000, 60%); $gray-lighter: lighten(#000, 93.5%); $gray-lightest: lighten(#000, 97.25%); +$page-background: #fbf7fc; + $font-family-sans-serif: "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif !default; $text-color: #222222; $text-muted: #999999; @@ -23,6 +25,10 @@ $brand-info: #5f9cd4; $brand-warning: #ffb419; $brand-danger: #d36060; +$font-size-base: 14px; +$font-size-h1: floor(($font-size-base * 2.15)); +$font-size-h2: floor(($font-size-base * 2.0)); + $btn-default-border: #CCCCCC; $border-radius-base: 3px !default; @@ -39,6 +45,11 @@ $navbar-inverse-link-color: white; $navbar-inverse-link-hover-color: $gray-lighter; $navbar-inverse-brand-hover-color: $gray-lighter; $navbar-inverse-color: white; +$navbar-default-bg: $page-background; + +$nav-link-hover-bg: $page-background; +$navbar-default-link-active-bg: $page-background; +$navbar-default-link-hover-bg: $page-background; $state-success-bg: white; $state-success-border: $brand-success; diff --git a/src/pretix/static/pretixcontrol/scss/_dashboard.scss b/src/pretix/static/pretixcontrol/scss/_dashboard.scss index 19afea100..af968e3c8 100644 --- a/src/pretix/static/pretixcontrol/scss/_dashboard.scss +++ b/src/pretix/static/pretixcontrol/scss/_dashboard.scss @@ -10,9 +10,12 @@ flex: 1 0 auto; align-self: stretch; padding: 15px 5px; - border: 5px solid white; min-height: 160px; - background: #F8F8F8; + margin: 5px; + + background: white; + box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07); + border-radius: $panel-border-radius; } .dashboard .widget-container.widget-full { @@ -110,6 +113,7 @@ } a.status-warning { background: $brand-warning; + color: black; } a.status-default { background: $gray-light; diff --git a/src/pretix/static/pretixcontrol/scss/_sb-admin-2.scss b/src/pretix/static/pretixcontrol/scss/_sb-admin-2.scss index b37c684bd..f555aee23 100644 --- a/src/pretix/static/pretixcontrol/scss/_sb-admin-2.scss +++ b/src/pretix/static/pretixcontrol/scss/_sb-admin-2.scss @@ -7,7 +7,7 @@ Modified by Raphael Michel // Global Styles body { - background-color: $gray-lightest; + background-color: $page-background; } // Wrappers @@ -17,17 +17,15 @@ body { } #page-wrapper { - padding: 0 15px; + padding: 20px 15px 0; min-height: 568px; - background-color: white; } @media(min-width:768px) { #page-wrapper { position: inherit; - margin: 0 0 0 250px; - padding: 0 30px; - border-left: 1px solid darken($gray-lightest, 6.5%); + margin: 0 0 0 220px; + padding: 20px 30px 0; } } @@ -95,7 +93,7 @@ body { // --Sidebar -.sidebar { +.sidebar { li .sidebar-nav.navbar-collapse { padding-left: 0; padding-right: 0; @@ -107,13 +105,7 @@ body { } .sidebar ul li { - border-bottom: 1px solid darken($gray-lightest, 6.5%); position: relative; - a { - &.active { - background-color: $gray-lighter; - } - } a.arrow { position: absolute; right: 0;