From 568e59e71c6b2d39c09dd326883ed1caa3d82c79 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Tue, 18 Oct 2016 18:22:44 +0200 Subject: [PATCH] Split base.css to their own css --- src/styles/{_base.sass => _app_base.sass} | 49 +- src/styles/{_utils.sass => _app_utils.sass} | 0 src/styles/_normalize.scss | 427 ------------------ src/styles/main.sass | 5 +- src/templates/attract/layout.jade | 1 + .../attract/tasks/view_task_embed.jade | 9 + 6 files changed, 42 insertions(+), 449 deletions(-) rename src/styles/{_base.sass => _app_base.sass} (89%) rename src/styles/{_utils.sass => _app_utils.sass} (100%) delete mode 100644 src/styles/_normalize.scss diff --git a/src/styles/_base.sass b/src/styles/_app_base.sass similarity index 89% rename from src/styles/_base.sass rename to src/styles/_app_base.sass index 84431e2..5c8a33c 100644 --- a/src/styles/_base.sass +++ b/src/styles/_app_base.sass @@ -1,35 +1,37 @@ -body - background-color: $color-background - position: absolute - top: 0 - left: 0 - right: 0 - bottom: 0 - height: 100% - width: 100% - margin: 0 - padding: 0 - font-family: 'Roboto' - -a - color: $color-primary - &:hover - color: $color-primary-dark - #app-main display: flex align-items: stretch height: 100% +.flyout.notifications + left: $sidebar-width + 5 + top: initial + bottom: 40px + box-shadow: 1px 1px 0 rgba(black, .1), 0 5px 50px rgba(black, .25) + nav.sidebar position: fixed + z-index: 1 left: 0 width: $sidebar-width height: 100% - background-color: $color-background-nav + background-color: $color-background-nav-dark display: flex flex-direction: column + .dropdown + min-width: $sidebar-width + + .dropdown-menu + top: initial + bottom: 3px + left: $sidebar-width + 5 + box-shadow: 1px 1px 0 rgba(black, .1), 0 5px 50px rgba(black, .25) + min-width: 200px + + li a + justify-content: flex-start + ul width: 100% margin: 0 @@ -58,6 +60,15 @@ nav.sidebar &:active outline: none + a.navbar-item + + a.dropdown-toggle + padding: 0 + margin: 0 + width: $sidebar-width + max-width: $sidebar-width + + #col_sidebar width: $sidebar-width min-width: $sidebar-width diff --git a/src/styles/_utils.sass b/src/styles/_app_utils.sass similarity index 100% rename from src/styles/_utils.sass rename to src/styles/_app_utils.sass diff --git a/src/styles/_normalize.scss b/src/styles/_normalize.scss deleted file mode 100644 index 458eea1..0000000 --- a/src/styles/_normalize.scss +++ /dev/null @@ -1,427 +0,0 @@ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ - -/** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. - */ - -html { - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ -} - -/** - * Remove default margin. - */ - -body { - margin: 0; -} - -/* HTML5 display definitions - ========================================================================== */ - -/** - * Correct `block` display not defined for any HTML5 element in IE 8/9. - * Correct `block` display not defined for `details` or `summary` in IE 10/11 - * and Firefox. - * Correct `block` display not defined for `main` in IE 11. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -main, -menu, -nav, -section, -summary { - display: block; -} - -/** - * 1. Correct `inline-block` display not defined in IE 8/9. - * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. - */ - -audio, -canvas, -progress, -video { - display: inline-block; /* 1 */ - vertical-align: baseline; /* 2 */ -} - -/** - * Prevent modern browsers from displaying `audio` without controls. - * Remove excess height in iOS 5 devices. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/** - * Address `[hidden]` styling not present in IE 8/9/10. - * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. - */ - -[hidden], -template { - display: none; -} - -/* Links - ========================================================================== */ - -/** - * Remove the gray background color from active links in IE 10. - */ - -a { - background-color: transparent; -} - -/** - * Improve readability when focused and also mouse hovered in all browsers. - */ - -a:active, -a:hover { - outline: 0; -} - -/* Text-level semantics - ========================================================================== */ - -/** - * Address styling not present in IE 8/9/10/11, Safari, and Chrome. - */ - -abbr[title] { - border-bottom: 1px dotted; -} - -/** - * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. - */ - -b, -strong { - font-weight: bold; -} - -/** - * Address styling not present in Safari and Chrome. - */ - -dfn { - font-style: italic; -} - -/** - * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari, and Chrome. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/** - * Address styling not present in IE 8/9. - */ - -mark { - background: #ff0; - color: #000; -} - -/** - * Address inconsistent and variable font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` affecting `line-height` in all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -/* Embedded content - ========================================================================== */ - -/** - * Remove border when inside `a` element in IE 8/9/10. - */ - -img { - border: 0; -} - -/** - * Correct overflow not hidden in IE 9/10/11. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Grouping content - ========================================================================== */ - -/** - * Address margin not present in IE 8/9 and Safari. - */ - -figure { - margin: 1em 40px; -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; -} - -/** - * Contain overflow in all browsers. - */ - -pre { - overflow: auto; -} - -/** - * Address odd `em`-unit font size rendering in all browsers. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; -} - -/* Forms - ========================================================================== */ - -/** - * Known limitation: by default, Chrome and Safari on OS X allow very limited - * styling of `select`, unless a `border` property is set. - */ - -/** - * 1. Correct color not being inherited. - * Known issue: affects color of disabled elements. - * 2. Correct font properties not being inherited. - * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. - */ - -button, -input, -optgroup, -select, -textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ -} - -/** - * Address `overflow` set to `hidden` in IE 8/9/10/11. - */ - -button { - overflow: visible; -} - -/** - * Address inconsistent `text-transform` inheritance for `button` and `select`. - * All other form control elements do not inherit `text-transform` values. - * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. - * Correct `select` style inheritance in Firefox. - */ - -button, -select { - text-transform: none; -} - -/** - * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. - * 2. Correct inability to style clickable `input` types in iOS. - * 3. Improve usability and consistency of cursor style between image-type - * `input` and others. - */ - -button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ -} - -/** - * Re-set default cursor for disabled elements. - */ - -button[disabled], -html input[disabled] { - cursor: default; -} - -/** - * Remove inner padding and border in Firefox 4+. - */ - -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; -} - -/** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. - */ - -input { - line-height: normal; -} - -/** - * It's recommended that you don't attempt to style these elements. - * Firefox's implementation doesn't respect box-sizing, padding, or width. - * - * 1. Address box sizing set to `content-box` in IE 8/9/10. - * 2. Remove excess padding in IE 8/9/10. - */ - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Fix the cursor style for Chrome's increment/decrement buttons. For certain - * `font-size` values of the `input`, it causes the cursor style of the - * decrement button to change from `default` to `text`. - */ - -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -/** - * 1. Address `appearance` set to `searchfield` in Safari and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari and Chrome - * (include `-moz` to future-proof). - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; -} - -/** - * Remove inner padding and search cancel button in Safari and Chrome on OS X. - * Safari (but not Chrome) clips the cancel button when the search input has - * padding (and `textfield` appearance). - */ - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * Define consistent border, margin, and padding. - */ - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/** - * 1. Correct `color` not being inherited in IE 8/9/10/11. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. - */ - -legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * Remove default vertical scrollbar in IE 8/9/10/11. - */ - -textarea { - overflow: auto; -} - -/** - * Don't inherit the `font-weight` (applied by a rule above). - * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. - */ - -optgroup { - font-weight: bold; -} - -/* Tables - ========================================================================== */ - -/** - * Remove most spacing between table cells. - */ - -table { - border-collapse: collapse; - border-spacing: 0; -} - -td, -th { - padding: 0; -} diff --git a/src/styles/main.sass b/src/styles/main.sass index 4f86b82..fc965df 100644 --- a/src/styles/main.sass +++ b/src/styles/main.sass @@ -1,8 +1,7 @@ -@import _normalize @import _config -@import _utils +@import _app_utils +@import _app_base -@import _base @import _tasks @import _shots @import _dashboard diff --git a/src/templates/attract/layout.jade b/src/templates/attract/layout.jade index 5149ef4..fd1196e 100644 --- a/src/templates/attract/layout.jade +++ b/src/templates/attract/layout.jade @@ -11,6 +11,7 @@ html(lang="en") link(href="{{ url_for('static_pillar', filename='assets/css/vendor/bootstrap.min.css') }}", rel="stylesheet") link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css', v=141020161) }}", rel="stylesheet") + link(href="{{ url_for('static_pillar', filename='assets/css/base.css', v=171020161) }}", rel="stylesheet") link(href="{{ url_for('static_attract', filename='assets/css/main.css') }}", rel="stylesheet") link(href="{{ url_for('static_attract', filename='assets/css/plugins/js_select2.css') }}", rel="stylesheet") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}") diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.jade index 5717eca..ab03e7c 100644 --- a/src/templates/attract/tasks/view_task_embed.jade +++ b/src/templates/attract/tasks/view_task_embed.jade @@ -120,3 +120,12 @@ script. var url = "{{ url_for('.activities', project_url=project.url, task_id=task['_id']) }}"; load_activities(url); // from 10_tasks.js + + {% if 'PUT' in task.allowed_methods %} + /* Resize textarea */ + var text = $('#task-description').val(), + matches = text.match(/\n/g), + breaks = matches ? matches.length : 2; + + $('#task-description').attr('rows',breaks + 4); + {% endif %}