diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index 9596376cd..8ab228012 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -1,5 +1,5 @@ - + sprite Created with Sketch (http://www.bohemiancoding.com/sketch) @@ -17,5 +17,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/javascripts/app/controllers/navigation.js.coffee b/app/assets/javascripts/app/controllers/navigation.js.coffee index d67467a86..a4b30f5ef 100644 --- a/app/assets/javascripts/app/controllers/navigation.js.coffee +++ b/app/assets/javascripts/app/controllers/navigation.js.coffee @@ -1,6 +1,9 @@ class App.Navigation extends App.Controller className: 'navigation vertical' + events: + 'click .empty-search': 'emptySearch' + constructor: -> super @render() @@ -205,6 +208,8 @@ class App.Navigation extends App.Controller @el.find('#global-search').bind( 'keyup', (e) => @term = @el.find('#global-search').val() + @el.find('.search').toggleClass('filled', !!@term) + return if !@term return if @term is search @delay( searchFunction, 220, 'search' ) @@ -212,6 +217,10 @@ class App.Navigation extends App.Controller @taskbar = new App.TaskbarWidget( el: @el.find('.tasks') ) + emptySearch: (event) => + @el.find('#global-search').val("") + @el.find('.search').removeClass('filled') + getItems: (data) -> navbar = _.values(data.navbar) diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco index cd2854c98..d8d804f71 100644 --- a/app/assets/javascripts/app/views/dashboard.jst.eco +++ b/app/assets/javascripts/app/views/dashboard.jst.eco @@ -1,12 +1,122 @@
-
+
-
- -
-

<%- @T( @head ) %>

+
+
+
My Stats
+
My Group
+
All
+ +
+
+
+

∅ Waiting time today

+
+
+
+
My handling time: 25 minutes
+
Average: 13%
+
+
+
+
+

Stimmung

+
+
+
+
3% of my tickets escalated.
+
Average: 17%
+
+
+
+
+

Channel Distribution

+
+ +
+
+
+
+
+
+
26%
+
+
+
+
+
+
+
+
24%
+
+ + +
+
+
+
+
+

Status

+
+
+
+
+
+
+
+
+
+
+
+
Tickets of my Group: 78 of 234
+
Average: 22%
+
+
+
+
+

Tickets in process

+
+
+
+
74% are currently in process
+
Average: 62%
+
+
+
+
+

Reopening rate

+
+
+
+
7% are being reopened
+
Average: 6%
+
+
+
+
diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index fe9952c15..73469b55f 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -88,4 +88,44 @@
  • <%- @T( 'Sign in' ) %>
    • --> -<% end %> \ No newline at end of file +<% end %> +
    +
    +

    Neuer Statuscheck, so sieht das mit zwei Zeilen Headline aus

    +
    +
    +
    + eskalierend +
    +
    +

    Personen

    +
    + Doreen Kubiak Steuerbüro C. Kaik +
    +
    + Martin Edenhofer Znuny GmbH +
    +
    + Oliver Ruhm Zeughaus GmbH +
    +
    +
    +
    +

    ID

    +
    #10009
    +
    +
    +

    Priorität

    +
    2 normal
    +
    +
    +

    Erstellt vor

    +
    60 Tagen (02. Feb. 2013)
    +
    +
    +

    Gruppe

    +
    Billing
    +
    +
    +
    +
    \ No newline at end of file diff --git a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco index e7b9b78c1..6a3962a80 100644 --- a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco +++ b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco @@ -3,7 +3,7 @@
    <%= item.data.head %>
    -
    +
    <% end %> \ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a4711c951..ac0ce43ba 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,6 +12,7 @@ *= require ./sew.css *= require ./layout.css *= require ./zzz.css + *= require ./fonts/fira-sans.css * *= require_tree ./custom/ * diff --git a/app/assets/stylesheets/fonts/fira-sans.css b/app/assets/stylesheets/fonts/fira-sans.css new file mode 100755 index 000000000..5c68b4e07 --- /dev/null +++ b/app/assets/stylesheets/fonts/fira-sans.css @@ -0,0 +1,44 @@ +/* Generated by Font Squirrel (http://www.fontsquirrel.com) on July 15, 2014 */ + + + +@font-face { + font-family: 'Fira Sans'; + src: url('firasans-regular-webfont.eot'); + src: url('firasans-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('firasans-regular-webfont.woff') format('woff'), + url('firasans-regular-webfont.ttf') format('truetype'), + url('firasans-regular-webfont.svg#fira_sansregular') format('svg'); + font-weight: normal; + font-style: normal; + +} + + + + +@font-face { + font-family: 'Fira Sans'; + src: url('firasans-bold-webfont.eot'); + src: url('firasans-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('firasans-bold-webfont.woff') format('woff'), + url('firasans-bold-webfont.ttf') format('truetype'), + url('firasans-bold-webfont.svg#fira_sansbold') format('svg'); + font-weight: bold; + font-style: normal; + +} + + + + +@font-face { + font-family: 'Fira Sans'; + src: url('firasans-light-webfont.eot'); + src: url('firasans-light-webfont.eot?#iefix') format('embedded-opentype'), + url('firasans-light-webfont.woff') format('woff'), + url('firasans-light-webfont.ttf') format('truetype'), + url('firasans-light-webfont.svg#fira_sanslight') format('svg'); + font-weight: 200; + font-style: normal; +} \ No newline at end of file diff --git a/app/assets/stylesheets/fonts/firasans-bold-webfont.eot b/app/assets/stylesheets/fonts/firasans-bold-webfont.eot new file mode 100755 index 000000000..37ce20b71 Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-bold-webfont.eot differ diff --git a/app/assets/stylesheets/fonts/firasans-bold-webfont.svg b/app/assets/stylesheets/fonts/firasans-bold-webfont.svg new file mode 100755 index 000000000..49772f01f --- /dev/null +++ b/app/assets/stylesheets/fonts/firasans-bold-webfont.svg @@ -0,0 +1,996 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/fonts/firasans-bold-webfont.ttf b/app/assets/stylesheets/fonts/firasans-bold-webfont.ttf new file mode 100755 index 000000000..20f31067d Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-bold-webfont.ttf differ diff --git a/app/assets/stylesheets/fonts/firasans-bold-webfont.woff b/app/assets/stylesheets/fonts/firasans-bold-webfont.woff new file mode 100755 index 000000000..bf935a0d2 Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-bold-webfont.woff differ diff --git a/app/assets/stylesheets/fonts/firasans-light-webfont.eot b/app/assets/stylesheets/fonts/firasans-light-webfont.eot new file mode 100755 index 000000000..94c99daf6 Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-light-webfont.eot differ diff --git a/app/assets/stylesheets/fonts/firasans-light-webfont.svg b/app/assets/stylesheets/fonts/firasans-light-webfont.svg new file mode 100755 index 000000000..22ce539ed --- /dev/null +++ b/app/assets/stylesheets/fonts/firasans-light-webfont.svg @@ -0,0 +1,996 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/fonts/firasans-light-webfont.ttf b/app/assets/stylesheets/fonts/firasans-light-webfont.ttf new file mode 100755 index 000000000..90f546e71 Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-light-webfont.ttf differ diff --git a/app/assets/stylesheets/fonts/firasans-light-webfont.woff b/app/assets/stylesheets/fonts/firasans-light-webfont.woff new file mode 100755 index 000000000..6d5c4d611 Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-light-webfont.woff differ diff --git a/app/assets/stylesheets/fonts/firasans-regular-webfont.eot b/app/assets/stylesheets/fonts/firasans-regular-webfont.eot new file mode 100755 index 000000000..e87652e08 Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-regular-webfont.eot differ diff --git a/app/assets/stylesheets/fonts/firasans-regular-webfont.svg b/app/assets/stylesheets/fonts/firasans-regular-webfont.svg new file mode 100755 index 000000000..2354f30e8 --- /dev/null +++ b/app/assets/stylesheets/fonts/firasans-regular-webfont.svg @@ -0,0 +1,996 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/fonts/firasans-regular-webfont.ttf b/app/assets/stylesheets/fonts/firasans-regular-webfont.ttf new file mode 100755 index 000000000..50511b430 Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-regular-webfont.ttf differ diff --git a/app/assets/stylesheets/fonts/firasans-regular-webfont.woff b/app/assets/stylesheets/fonts/firasans-regular-webfont.woff new file mode 100755 index 000000000..f9285617c Binary files /dev/null and b/app/assets/stylesheets/fonts/firasans-regular-webfont.woff differ diff --git a/app/assets/stylesheets/layout.css b/app/assets/stylesheets/layout.css index 5fd507828..05db3f68f 100755 --- a/app/assets/stylesheets/layout.css +++ b/app/assets/stylesheets/layout.css @@ -1,4 +1,4 @@ -.horizontal, .vertical { +.horizontal, .vertical, .centered { display: -webkit-box !important; display: -ms-flexbox !important; display: -moz-flex !important; @@ -184,3 +184,19 @@ body.fit { -webkit-align-items: flex-end; align-items: flex-end; } + +.two-columns, +.three-columns { + -ms-box-lines: multiple; + -moz-flex-wrap: wrap; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; +} + +.two-columns > .column { + width: 50%; +} + +.three-columns > .column { + width: 33.33%; +} diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index 8e8e73bf5..a2376e2cc 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1,6 +1,7 @@ body { - font-family: "FiraSansOT", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; line-height: 1.7; + font-weight: normal; background: #2c2d36; } @@ -42,11 +43,6 @@ table th, table td { display: table-cell; border-bottom: 1px solid #eeeeee; } - -.popover { - min-width: 240px; - z-index: 1110; -} .hero-two { width: 100%; } @@ -378,18 +374,27 @@ h1 { line-height: 29px; color: rgba(0,8,14,.73); } -h2 { + +h2, +h2.popover-title { font-size: 19px; line-height: 25px; color: rgba(0,8,14,.73); } + h3 { - font-size: 22px; - margin-top: 10px; + font-size: 13px; + margin: 14px 0 6px; + color: #a9bcc4; + font-weight: 200; + text-transform: uppercase; + letter-spacing: 0.07em; } + h4 { font-size: 20px; } + h5 { font-size: 16px; } @@ -634,13 +639,12 @@ ol.tabs li { } .tab { - height: 43px; - padding: 10px; + height: 39px; + padding: 9px; text-align: center; border-right: 1px solid rgba(0,8,14,.08); cursor: pointer; flex-grow: 1; - box-shadow: 0 2px rgba(0,0,0,.03); } .tab.active { @@ -658,6 +662,23 @@ ol.tabs li { border-right: none; } + .wide-tabs { + width: 60%; + margin: 25px auto 20px; + font-size: 15px; + font-weight: 300; + background: white; + border-radius: 8px; + } + + .wide-tabs .tab:first-child { + border-radius: 8px 0 0 8px; + } + + .wide-tabs .tab:last-child { + border-radius: 0 8px 8px 0; + } + .contain-text { white-space: nowrap; overflow: hidden; @@ -776,7 +797,6 @@ ol.tabs li { position: relative; } - .modified.priority.icon { width: 12px; height: 12px; @@ -842,8 +862,8 @@ ol.tabs li { transform: rotate(-45deg); } - .close-task:before, - .close-task:after { + .close-task.icon:before, + .close-task.icon:after { top: 20%; height: 60%; background: #586066; @@ -869,6 +889,139 @@ ol.tabs li { background-position: -14px -128px; } + .channel.icon { + width: 17px; + height: 16px; + } + + .email.channel.icon { + background-position: 0 -141px; + } + + .received-calls.channel.icon { + background-position: -17px -141px; + } + + .outbound-calls.channel.icon { + background-position: -34px -141px; + } + + .facebook.channel.icon { + background-position: -51px -141px; + } + + .twitter.channel.icon { + background-position: -68px -141px; + } + + .mood.icon { + width: 60px; + height: 59px; + } + + .mood.icon.superbad-state { + background-position: 0 -157px; + } + + .mood.icon.bad-state { + background-position: -60px -157px; + } + + .mood.icon.ok-state { + background-position: -120px -157px; + } + + .mood.icon.good-state { + background-position: -180px -157px; + } + + .mood.icon.supergood-state { + background-position: -240px -157px; + } + + .stopwatch.icon { + width: 77px; + height: 83px; + background-position: 0 -216px; + } + + .in-process.icon { + width: 64px; + height: 64px; + background-position: -77px -216px; + } + + .in-process.superbad-state, + .reopening.superbad-state { + background-color: #f35910; + } + + .in-process.bad-state, + .reopening.bad-state { + background-color: #f6820b; + } + + .in-process.ok-state, + .reopening.ok-state { + background-color: #faab00; + } + + .in-process.good-state, + .reopening.good-state { + background-color: #a9ac41; + } + + .in-process.supergood-state, + .reopening.supergood-state { + background-color: #38ae6a; + } + + .reopening.icon { + width: 68px; + height: 47px; + background-position: -141px -216px; + } + + .stat-all-tickets.icon { + width: 48px; + height: 83px; + background-position: -209px -216px; + } + + .stat-tickets { + height: 83px; + margin-right: 4px; + margin-bottom: -9px; + } + + .stat-ticket.icon { + width: 48px; + height: 10px; + margin-top: -7px; + margin-bottom: 2px; + } + + .stat-ticket.superbad-state { + background-position: -257px -256px; + } + + .stat-ticket.bad-state { + background-position: -257px -246px; + } + + .stat-ticket.ok-state { + background-position: -257px -236px; + } + + .stat-ticket.good-state { + background-position: -257px -226px; + } + + .stat-ticket.supergood-state { + background-position: -257px -216px; + } + + /* * removed margin of forms to not break the layout with submit buttons within
    area e. g. for modal dialogs */ @@ -1306,13 +1459,20 @@ footer { .task { height: 38px; - padding: 10px 15px 10px 8px; - color: #808080; + padding: 10px 15px 7px 8px; border-bottom: 1px solid #33363e; cursor: pointer; position: relative; } + .task .name { + color: #808080; + } + + .task:hover { + text-decoration: none; + } + .task .priority.icon { margin-top: -2px; margin-right: 10px; @@ -1326,7 +1486,7 @@ footer { background: #26272e; } - .task.active { + .task.active .name { color: white; } @@ -1337,6 +1497,10 @@ footer { border-color: white; } + .level-2 { + color: #38ae6a; + } + .level-1 .priority.icon, .level-1.active, .level-1.active .priority.icon:after, @@ -1344,6 +1508,11 @@ footer { .level-1 .modified.priority.icon:after { background-color: #38ae6a; border-color: #38ae6a; + color: #38ae6a; + } + + .level-2 { + color: #f35910; } .level-2 .priority.icon, @@ -1353,6 +1522,11 @@ footer { .level-2 .modified.priority.icon:after { background-color: #f35910; border-color: #f35910; + color: #f35910; + } + + .level-3 { + color: #faab00; } .level-3 .priority.icon, @@ -1477,17 +1651,20 @@ footer { margin-right: 13px; } - .search .custom-dropdown-menu > li:hover > a { + .search .custom-dropdown-menu > li:hover > a, + .search .custom-dropdown-menu > li.active > a { background: #3fa9f5; color: white; text-decoration: none; } - .search .custom-dropdown-menu > li:hover > a .priority.icon { + .search .custom-dropdown-menu > li:hover > a .priority.icon, + .search .custom-dropdown-menu > li.active > a .priority.icon { background: white; } - .search .custom-dropdown-menu > li:hover > a .priority.icon:after { + .search .custom-dropdown-menu > li:hover > a .priority.icon:after, + .search .custom-dropdown-menu > li.active > a .priority.icon:after { background: #3fa9f5; } @@ -1665,4 +1842,157 @@ footer { padding: 10px 20px; background: #f8f9fa; overflow: auto; +} + +.popover { + width: 372px; + max-width: 9999px; + border-radius: 0; + border: none; + z-index: 1110; + box-shadow: 0 1px 14px rgba(0,8,14,.25); +} + + .popover-title { + border: none; + background: none; + padding: 20px 17px 4px; + } + + .popover-content { + padding: 0 17px 10px; + } + + .popover.right { margin-left: 4px; } + .popover.right > .arrow { + border-right: none; + left: -9px; + } + + .popover.top { margin-bottom: 9px; } + .popover.top > .arrow { + border-top: none; + bottom: -9px; + } + + .popover.left { margin-right: 9px; } + .popover.left > .arrow { + border-left: none; + right: -9px; + } + + .popover.bottom { margin-top: 9px; } + .popover.bottom > .arrow { + border-bottom: none; + top: -9px; + } + + .popover > .arrow:after { + border-width: 8px; + } + + .popover .priority.icon:after { + background: white; + } + + .popover .person .company { + color: #a1a4a7; + } + + .popover hr { + margin: 8px 0; + } + + .popover .person .company:before { content: '('; } + .popover .person .company:after { content: ')'; } + + .popover .column h3 { + margin: 8px 0 1px; + } + + .popover .column { + margin-bottom: 8px; + } + +.stat-widgets { + margin: 0 -7px; +} + + .stat-widget { + height: 200px; + margin: 7px; + padding: 13px; + text-align: center; + line-height: 20px; + background: white; + border: 1px solid #e5f0f5; + border-radius: 1px; + box-shadow: 0 1px rgba(0,8,14,.02); + } + + .stat-widget h3 { + margin: 2px 0 8px; + color: #444a4f; + letter-spacing: 0; + font-weight: normal; + } + + .stat-widget .stat-label { + color: #444a4f; + } + + .stat-widget .stat-detail { + color: #b4b7b9; + } + + .channel-distribution.stat-widget { + color: #a1a4a7; + } + +.stats-channel { + padding: 8px 0 7px; + margin-bottom: -7px; + border-radius: 3px; +} + +.stats-channel:hover { + background: rgba(0,8,14,.03); +} + + .stats-channel .channel-bars { + height: 73px; + margin: 16px 0 15px; + padding: 2px 12px; + width: 100%; + background: linear-gradient(to top, #f2f2f3, #f2f2f3 1px, transparent 1px); + background-position: center bottom; + background-size: 100% 12px; + } + + .channel-bars .channel-bar { + border-radius: 5px; + width: 10px; + background: #a9bcc4; + } + + .channel-bars .channel-bar.secondary { + opacity: .38; + } + +.activity.sidebar { + border-left: 1px solid #e8e8e8; +} + +/* + + ---------------- + normal screens + ---------------- + +*/ + +@media only screen and (max-width: 1280px) { + .activity.sidebar { + display: none; + } } \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 57fc0ef1c..6cd4b4bff 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,6 +1,7 @@ + <%= Setting.get('product_name') %> <%= stylesheet_link_tag "application" %> <% if Rails.configuration.assets.debug %>