diff --git a/app/models/Component.php b/app/models/Component.php index f7fb161c..25e3168a 100644 --- a/app/models/Component.php +++ b/app/models/Component.php @@ -9,4 +9,13 @@ case 4: return 'Major Outage'; } } + + public function getColorAttribute() { + switch ($this->status) { + case 1: return 'text-success'; + case 2: return 'text-info'; + case 3: return 'text-alert'; + case 4: return 'text-danger'; + } + } } diff --git a/app/models/Incident.php b/app/models/Incident.php index 882388ab..9e5a137f 100644 --- a/app/models/Incident.php +++ b/app/models/Incident.php @@ -15,6 +15,7 @@ case 1: return 'warning'; case 2: + return 'alert'; case 3: return 'info'; case 4: @@ -27,7 +28,7 @@ case 1: return 'glyphicon-flag'; case 2: - return 'glyphicon-certificate'; + return 'glyphicon-warning-sign'; case 3: return 'glyphicon-eye-open'; case 4: diff --git a/app/views/incident.blade.php b/app/views/incident.blade.php index fd29e222..b69dcd2c 100644 --- a/app/views/incident.blade.php +++ b/app/views/incident.blade.php @@ -1,22 +1,23 @@ -
  • + diff --git a/app/views/index.blade.php b/app/views/index.blade.php index a80c9105..87ed54aa 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -1,32 +1,21 @@ @extends('layout.master') @section('content') +
    {{ $systemMessage }}
    +
    -
    {{ $systemMessage }}
    +
    - - -

    Past Incidents

    - @stop diff --git a/config.codekit b/config.codekit new file mode 100644 index 00000000..34b905ac --- /dev/null +++ b/config.codekit @@ -0,0 +1,829 @@ +{ +"CodeKitInfo": "This is a CodeKit 2.x project configuration file. It is designed to sync project settings across multiple machines. MODIFYING THE CONTENTS OF THIS FILE IS A POOR LIFE DECISION. If you do so, you will likely cause CodeKit to crash. This file is not useful unless accompanied by the project that created it in CodeKit 2. This file is not backwards-compatible with CodeKit 1.x. For more information, see: http:\/\/incident57.com\/codekit", +"creatorBuild": "18270", +"files": { + "\/CONTRIBUTING.md": { + "enableFootnoteSupport": 0, + "enableSmartyPants": 1, + "expandTabs": 1, + "fileType": 4096, + "ignore": 1, + "ignoreWasSetByUser": 1, + "inputAbbreviatedPath": "\/CONTRIBUTING.md", + "outputAbbreviatedPath": "\/CONTRIBUTING.html", + "outputPathIsOutsideProject": 0, + "outputPathIsSetByUser": 0 + }, + "\/gulpfile.js": { + "fileType": 64, + "ignore": 1, + "ignoreWasSetByUser": 1, + "inputAbbreviatedPath": "\/gulpfile.js", + "outputAbbreviatedPath": "\/min\/gulpfile-min.js", + "outputPathIsOutsideProject": 0, + "outputPathIsSetByUser": 0, + "outputStyle": 1, + "syntaxCheckerStyle": 1 + }, + "\/readme.md": { + "enableFootnoteSupport": 0, + "enableSmartyPants": 1, + "expandTabs": 1, + "fileType": 4096, + "ignore": 1, + "ignoreWasSetByUser": 1, + "inputAbbreviatedPath": "\/readme.md", + "outputAbbreviatedPath": "\/readme.html", + "outputPathIsOutsideProject": 0, + "outputPathIsSetByUser": 0 + }, + "\/server.php": { + "fileType": 8192, + "ignore": 0, + "ignoreWasSetByUser": 0, + "inputAbbreviatedPath": "\/server.php", + "outputAbbreviatedPath": "No Output Path", + "outputPathIsOutsideProject": 0, + "outputPathIsSetByUser": 0 + } + }, +"hooks": [ + ], +"lastSavedByUser": "James Brooks", +"manualImportLinks": { + }, +"projectAttributes": { + "bowerAbbreviatedPath": "", + "displayValue": "Cachet", + "displayValueWasSetByUser": 0, + "iconImageName": "pencil_brown" + }, +"projectSettings": { + "alwaysUseExternalServer": 1, + "animateCSSInjections": 1, + "autoApplyPSLanguageSettingsStyle": 0, + "autoprefixerBrowserString": "> 1%, last 2 versions, Firefox ESR, Opera 12.1", + "autoSyncProjectSettingsFile": 1, + "browserRefreshDelay": 0, + "coffeeAutoOutputPathEnabled": 1, + "coffeeAutoOutputPathFilenamePattern": "*.js", + "coffeeAutoOutputPathRelativePath": "", + "coffeeAutoOutputPathReplace1": "", + "coffeeAutoOutputPathReplace2": "", + "coffeeAutoOutputPathStyle": 0, + "coffeeCreateSourceMap": 0, + "coffeeLintFlags2": { + "arrow_spacing": { + "active": 0, + "flagValue": -1 + }, + "camel_case_classes": { + "active": 1, + "flagValue": -1 + }, + "colon_assignment_spacing": { + "active": 0, + "flagValue": 1 + }, + "cyclomatic_complexity": { + "active": 0, + "flagValue": 10 + }, + "duplicate_key": { + "active": 1, + "flagValue": -1 + }, + "empty_constructor_needs_parens": { + "active": 0, + "flagValue": -1 + }, + "indentation": { + "active": 1, + "flagValue": 2 + }, + "line_endings": { + "active": 0, + "flagValue": 0 + }, + "max_line_length": { + "active": 0, + "flagValue": 150 + }, + "missing_fat_arrows": { + "active": 0, + "flagValue": -1 + }, + "newlines_after_classes": { + "active": 0, + "flagValue": 3 + }, + "no_backticks": { + "active": 1, + "flagValue": -1 + }, + "no_debugger": { + "active": 1, + "flagValue": -1 + }, + "no_empty_functions": { + "active": 0, + "flagValue": -1 + }, + "no_empty_param_list": { + "active": 0, + "flagValue": -1 + }, + "no_implicit_braces": { + "active": 1, + "flagValue": -1 + }, + "no_implicit_parens": { + "active": 0, + "flagValue": -1 + }, + "no_interpolation_in_single_quotes": { + "active": 0, + "flagValue": -1 + }, + "no_plusplus": { + "active": 0, + "flagValue": -1 + }, + "no_stand_alone_at": { + "active": 1, + "flagValue": -1 + }, + "no_tabs": { + "active": 1, + "flagValue": -1 + }, + "no_throwing_strings": { + "active": 1, + "flagValue": -1 + }, + "no_trailing_semicolons": { + "active": 1, + "flagValue": -1 + }, + "no_trailing_whitespace": { + "active": 1, + "flagValue": -1 + }, + "no_unnecessary_double_quotes": { + "active": 0, + "flagValue": -1 + }, + "no_unnecessary_fat_arrows": { + "active": 1, + "flagValue": -1 + }, + "non_empty_constructor_needs_parens": { + "active": 0, + "flagValue": -1 + }, + "prefer_english_operator": { + "active": 0, + "flagValue": -1 + }, + "space_operators": { + "active": 0, + "flagValue": -1 + } + }, + "coffeeMinifyOutput": 1, + "coffeeOutputStyle": 0, + "coffeeSyntaxCheckerStyle": 1, + "externalServerAddress": "http:\/\/cachet.io.dev", + "externalServerPreviewPathAddition": "", + "genericWebpageFileExtensionsString": "html, htm, shtml, shtm, xhtml, php, jsp, asp, aspx, erb, ctp", + "hamlAutoOutputPathEnabled": 1, + "hamlAutoOutputPathFilenamePattern": "*.html", + "hamlAutoOutputPathRelativePath": "", + "hamlAutoOutputPathReplace1": "", + "hamlAutoOutputPathReplace2": "", + "hamlAutoOutputPathStyle": 0, + "hamlEscapeHTMLCharacters": 0, + "hamlNoEscapeInAttributes": 0, + "hamlOutputFormat": 2, + "hamlOutputStyle": 0, + "hamlUseCDATA": 0, + "hamlUseDoubleQuotes": 0, + "hamlUseUnixNewlines": 0, + "jadeAutoOutputPathEnabled": 1, + "jadeAutoOutputPathFilenamePattern": "*.html", + "jadeAutoOutputPathRelativePath": "", + "jadeAutoOutputPathReplace1": "", + "jadeAutoOutputPathReplace2": "", + "jadeAutoOutputPathStyle": 0, + "jadeCompileDebug": 1, + "jadeOutputStyle": 0, + "javascriptAutoOutputPathEnabled": 1, + "javascriptAutoOutputPathFilenamePattern": "*-min.js", + "javascriptAutoOutputPathRelativePath": "\/min", + "javascriptAutoOutputPathReplace1": "", + "javascriptAutoOutputPathReplace2": "", + "javascriptAutoOutputPathStyle": 2, + "javascriptCreateSourceMap": 1, + "javascriptOutputStyle": 1, + "javascriptSyntaxCheckerStyle": 1, + "jsCheckerReservedNamesString": "", + "jsHintFlags2": { + "asi": { + "active": 0, + "flagValue": -1 + }, + "bitwise": { + "active": 1, + "flagValue": -1 + }, + "boss": { + "active": 0, + "flagValue": -1 + }, + "browser": { + "active": 1, + "flagValue": -1 + }, + "camelcase": { + "active": 0, + "flagValue": -1 + }, + "couch": { + "active": 0, + "flagValue": -1 + }, + "curly": { + "active": 1, + "flagValue": -1 + }, + "debug": { + "active": 0, + "flagValue": -1 + }, + "devel": { + "active": 0, + "flagValue": -1 + }, + "dojo": { + "active": 0, + "flagValue": -1 + }, + "eqeqeq": { + "active": 1, + "flagValue": -1 + }, + "eqnull": { + "active": 0, + "flagValue": -1 + }, + "es3": { + "active": 0, + "flagValue": -1 + }, + "esnext": { + "active": 0, + "flagValue": -1 + }, + "evil": { + "active": 0, + "flagValue": -1 + }, + "expr": { + "active": 0, + "flagValue": -1 + }, + "forin": { + "active": 0, + "flagValue": -1 + }, + "freeze": { + "active": 1, + "flagValue": -1 + }, + "funcscope": { + "active": 0, + "flagValue": -1 + }, + "globalstrict": { + "active": 0, + "flagValue": -1 + }, + "immed": { + "active": 0, + "flagValue": -1 + }, + "indent": { + "active": 0, + "flagValue": 4 + }, + "iterator": { + "active": 0, + "flagValue": -1 + }, + "jquery": { + "active": 1, + "flagValue": -1 + }, + "lastsemic": { + "active": 0, + "flagValue": -1 + }, + "latedef": { + "active": 1, + "flagValue": -1 + }, + "laxbreak": { + "active": 0, + "flagValue": -1 + }, + "laxcomma": { + "active": 0, + "flagValue": -1 + }, + "loopfunc": { + "active": 0, + "flagValue": -1 + }, + "maxcomplexity": { + "active": 0, + "flagValue": 10 + }, + "maxdepth": { + "active": 0, + "flagValue": 3 + }, + "maxlen": { + "active": 0, + "flagValue": 150 + }, + "maxparams": { + "active": 0, + "flagValue": 3 + }, + "maxstatements": { + "active": 0, + "flagValue": 4 + }, + "mootools": { + "active": 0, + "flagValue": -1 + }, + "moz": { + "active": 0, + "flagValue": -1 + }, + "multistr": { + "active": 0, + "flagValue": -1 + }, + "newcap": { + "active": 1, + "flagValue": -1 + }, + "noarg": { + "active": 1, + "flagValue": -1 + }, + "node": { + "active": 0, + "flagValue": -1 + }, + "noempty": { + "active": 0, + "flagValue": -1 + }, + "nonbsp": { + "active": 0, + "flagValue": -1 + }, + "nonew": { + "active": 1, + "flagValue": -1 + }, + "nonstandard": { + "active": 0, + "flagValue": -1 + }, + "notypeof": { + "active": 1, + "flagValue": -1 + }, + "noyield": { + "active": 0, + "flagValue": -1 + }, + "onecase": { + "active": 0, + "flagValue": -1 + }, + "phantom": { + "active": 0, + "flagValue": -1 + }, + "plusplus": { + "active": 0, + "flagValue": -1 + }, + "proto": { + "active": 0, + "flagValue": -1 + }, + "prototypejs": { + "active": 0, + "flagValue": -1 + }, + "regexp": { + "active": 1, + "flagValue": -1 + }, + "rhino": { + "active": 0, + "flagValue": -1 + }, + "scripturl": { + "active": 0, + "flagValue": -1 + }, + "shadow": { + "active": 0, + "flagValue": -1 + }, + "shelljs": { + "active": 0, + "flagValue": -1 + }, + "singleGroups": { + "active": 0, + "flagValue": -1 + }, + "strict": { + "active": 0, + "flagValue": -1 + }, + "sub": { + "active": 0, + "flagValue": -1 + }, + "supernew": { + "active": 0, + "flagValue": -1 + }, + "typed": { + "active": 0, + "flagValue": -1 + }, + "undef": { + "active": 1, + "flagValue": -1 + }, + "unused": { + "active": 1, + "flagValue": -1 + }, + "withstmt": { + "active": 0, + "flagValue": -1 + }, + "worker": { + "active": 0, + "flagValue": -1 + }, + "wsh": { + "active": 0, + "flagValue": -1 + }, + "yui": { + "active": 0, + "flagValue": -1 + } + }, + "jsLintFlags2": { + "ass": { + "active": 0, + "flagValue": -1 + }, + "bitwise": { + "active": 0, + "flagValue": -1 + }, + "browser": { + "active": 1, + "flagValue": -1 + }, + "closure": { + "active": 0, + "flagValue": -1 + }, + "continue": { + "active": 0, + "flagValue": -1 + }, + "debug": { + "active": 0, + "flagValue": -1 + }, + "devel": { + "active": 0, + "flagValue": -1 + }, + "eqeq": { + "active": 0, + "flagValue": -1 + }, + "evil": { + "active": 0, + "flagValue": -1 + }, + "forin": { + "active": 0, + "flagValue": -1 + }, + "indent": { + "active": 0, + "flagValue": 4 + }, + "maxlen": { + "active": 0, + "flagValue": 150 + }, + "newcap": { + "active": 0, + "flagValue": -1 + }, + "node": { + "active": 0, + "flagValue": -1 + }, + "nomen": { + "active": 0, + "flagValue": -1 + }, + "plusplus": { + "active": 0, + "flagValue": -1 + }, + "properties": { + "active": 0, + "flagValue": -1 + }, + "regexp": { + "active": 0, + "flagValue": -1 + }, + "rhino": { + "active": 0, + "flagValue": -1 + }, + "sloppy": { + "active": 0, + "flagValue": -1 + }, + "stupid": { + "active": 0, + "flagValue": -1 + }, + "sub": { + "active": 0, + "flagValue": -1 + }, + "todo": { + "active": 0, + "flagValue": -1 + }, + "unparam": { + "active": 0, + "flagValue": -1 + }, + "vars": { + "active": 0, + "flagValue": -1 + }, + "white": { + "active": 0, + "flagValue": -1 + } + }, + "kitAutoOutputPathEnabled": 1, + "kitAutoOutputPathFilenamePattern": "*.html", + "kitAutoOutputPathRelativePath": "", + "kitAutoOutputPathReplace1": "", + "kitAutoOutputPathReplace2": "", + "kitAutoOutputPathStyle": 0, + "lessAllowInsecureImports": 0, + "lessAutoOutputPathEnabled": 1, + "lessAutoOutputPathFilenamePattern": "*.css", + "lessAutoOutputPathRelativePath": "..\/css", + "lessAutoOutputPathReplace1": "less", + "lessAutoOutputPathReplace2": "css", + "lessAutoOutputPathStyle": 2, + "lessCreateSourceMap": 0, + "lessDisableJavascript": 0, + "lessIeCompatibility": 1, + "lessOutputStyle": 0, + "lessRelativeURLS": 0, + "lessStrictImports": 0, + "lessStrictMath": 0, + "lessStrictUnits": 0, + "markdownAutoOutputPathEnabled": 1, + "markdownAutoOutputPathFilenamePattern": "*.html", + "markdownAutoOutputPathRelativePath": "", + "markdownAutoOutputPathReplace1": "", + "markdownAutoOutputPathReplace2": "", + "markdownAutoOutputPathStyle": 0, + "markdownEnableFootnotes": 0, + "markdownEnableSmartyPants": 1, + "markdownExpandTabs": 1, + "reloadFileURLs": 0, + "sassAutoOutputPathEnabled": 1, + "sassAutoOutputPathFilenamePattern": "*.css", + "sassAutoOutputPathRelativePath": "..\/css", + "sassAutoOutputPathReplace1": "sass", + "sassAutoOutputPathReplace2": "css", + "sassAutoOutputPathStyle": 2, + "sassCreateSourceMap": 0, + "sassDebugStyle": 0, + "sassDecimalPrecision": 10, + "sassOutputStyle": 0, + "sassUseLibsass": 0, + "shouldRunAutoprefixer": 0, + "shouldRunBless": 0, + "skippedItemsString": "node_modules, \/vendor, \/bootstrap, _logs, \/public, .hg, _cache, log, logs, cache, .svn, .git, \/app", + "slimAutoOutputPathEnabled": 1, + "slimAutoOutputPathFilenamePattern": "*.html", + "slimAutoOutputPathRelativePath": "", + "slimAutoOutputPathReplace1": "", + "slimAutoOutputPathReplace2": "", + "slimAutoOutputPathStyle": 0, + "slimCompileOnly": 0, + "slimLogicless": 0, + "slimOutputStyle": 1, + "slimRailsCompatible": 0, + "stylusAutoOutputPathEnabled": 1, + "stylusAutoOutputPathFilenamePattern": "*.css", + "stylusAutoOutputPathRelativePath": "..\/css", + "stylusAutoOutputPathReplace1": "stylus", + "stylusAutoOutputPathReplace2": "css", + "stylusAutoOutputPathStyle": 2, + "stylusCreateSourceMap": 0, + "stylusDebugStyle": 0, + "stylusImportCSS": 0, + "stylusOutputStyle": 0, + "stylusResolveRelativeURLS": 0, + "typescriptAutoOutputPathEnabled": 1, + "typescriptAutoOutputPathFilenamePattern": "*.js", + "typescriptAutoOutputPathRelativePath": "\/js", + "typescriptAutoOutputPathReplace1": "", + "typescriptAutoOutputPathReplace2": "", + "typescriptAutoOutputPathStyle": 2, + "typescriptCreateDeclarationFile": 0, + "typescriptCreateSourceMap": 0, + "typescriptMinifyOutput": 0, + "typescriptModuleType": 0, + "typescriptNoImplicitAny": 0, + "typescriptNoResolve": 0, + "typescriptRemoveComments": 0, + "typescriptTargetECMAVersion": 0, + "uglifyDefinesString": "", + "uglifyFlags2": { + "ascii-only": { + "active": 0, + "flagValue": -1 + }, + "booleans": { + "active": 1, + "flagValue": -1 + }, + "bracketize": { + "active": 0, + "flagValue": -1 + }, + "cascade": { + "active": 1, + "flagValue": -1 + }, + "comments": { + "active": 1, + "flagValue": -1 + }, + "comparisons": { + "active": 1, + "flagValue": -1 + }, + "compress": { + "active": 1, + "flagValue": -1 + }, + "conditionals": { + "active": 1, + "flagValue": -1 + }, + "dead_code": { + "active": 0, + "flagValue": -1 + }, + "drop_debugger": { + "active": 1, + "flagValue": -1 + }, + "eval": { + "active": 0, + "flagValue": -1 + }, + "evaluate": { + "active": 1, + "flagValue": -1 + }, + "hoist_funs": { + "active": 1, + "flagValue": -1 + }, + "hoist_vars": { + "active": 0, + "flagValue": -1 + }, + "if_return": { + "active": 1, + "flagValue": -1 + }, + "indent-level": { + "active": 0, + "flagValue": 4 + }, + "indent-start": { + "active": 0, + "flagValue": 0 + }, + "inline-script": { + "active": 0, + "flagValue": -1 + }, + "join_vars": { + "active": 1, + "flagValue": -1 + }, + "loops": { + "active": 1, + "flagValue": -1 + }, + "mangle": { + "active": 1, + "flagValue": -1 + }, + "max-line-len": { + "active": 1, + "flagValue": 32000 + }, + "properties": { + "active": 1, + "flagValue": -1 + }, + "quote-keys": { + "active": 0, + "flagValue": -1 + }, + "screw-ie8": { + "active": 0, + "flagValue": -1 + }, + "semicolons": { + "active": 1, + "flagValue": -1 + }, + "sequences": { + "active": 1, + "flagValue": -1 + }, + "sort": { + "active": 0, + "flagValue": -1 + }, + "space-colon": { + "active": 1, + "flagValue": -1 + }, + "toplevel": { + "active": 0, + "flagValue": -1 + }, + "unsafe": { + "active": 0, + "flagValue": -1 + }, + "unused": { + "active": 0, + "flagValue": -1 + }, + "warnings": { + "active": 0, + "flagValue": -1 + }, + "width": { + "active": 1, + "flagValue": 80 + } + }, + "uglifyReservedNamesString": "$", + "websiteRelativeRoot": "" + }, +"settingsFileVersion": "2" +} \ No newline at end of file diff --git a/public/assets/sass/application.scss b/public/assets/sass/application.scss index 40182d54..52c851fc 100755 --- a/public/assets/sass/application.scss +++ b/public/assets/sass/application.scss @@ -1,6 +1,7 @@ body { color: #333333; font-size: 1.4em; + font-weight: 300; } hr { @@ -8,7 +9,34 @@ hr { margin-bottom: 10px; } +h1 { + margin-bottom: 20px; +} + +.text-success { + color: #4cae4c; +} + +.text-danger { + color: #D91E18; +} + +.text-alert { + color: #F9BF3B; +} + +.container { + max-width: 960px; +} + +.page-header { + margin-top: 10px; +} + .alert { + margin-top: 20px; + border-radius: 0; + font-size: 1.2em; &.alert-success { background-color: #8DCD8D; border-color: #4cae4c; @@ -28,20 +56,58 @@ hr { } } +.badge { + padding-top: 8px; + padding-bottom: 8px; + padding-left: 12px; + padding-right: 12px; + &.badge-success { + background-color: #4cae4c; + } + &.badge-info { + background-color: #46b8da; + } + &.badge-warning { + background-color: #F27935; + } + &.badge-alert { + background-color: #F9BF3B; + } + &.badge-danger { + background-color: #CF000F; + } +} + .list-group { margin-bottom: 20px; padding-left: 0; + border-radius: 0; .list-group-item { - padding: 10px 15px; + border-radius: 0; background-color: #ffffff; border: 1px solid #BDC3C7; + font-size: 1.1em; + + span.badge { + position: absolute; + top: 0; + right: 0; + border-radius: 0; + display: block; + } + + i.glyphicon { + font-size: 1.4em; + } h1, h2, h3, h4 { - &.list-group-item-heading { - margin-top: 5px; - margin-bottom: 5px; - } + margin-bottom: 2px; + } + + h4 { + font-weight: 400; + max-width: 90%; } p, time { @@ -51,7 +117,35 @@ hr { time { color: #6C7A89; - font-weight: bold; + // letter-spacing: 0.02em; + font-weight: 600; + font-size: 1.1em; + } + + &.active { + background-color: #F2F1EF; + h3 { + color: #22313F; + padding-top: 6px; + padding-bottom: 6px; + font-weight: 300; + font-size: 1.6em; + } + + &:hover { + color: inherit; + border-color: #BDC3C7; + } + } + } + + &.components { + margin-bottom: 30px; + p { + margin-bottom: 10px; + } + .badge { + color: transparent; } } } diff --git a/public/build/css/application-52640275.css b/public/build/css/application-52640275.css new file mode 100755 index 00000000..111dd246 --- /dev/null +++ b/public/build/css/application-52640275.css @@ -0,0 +1,106 @@ +body { + color: #333333; + font-size: 1.4em; + font-weight: 300; } + +hr { + margin-top: 10px; + margin-bottom: 10px; } + +h1 { + margin-bottom: 20px; } + +.text-success { + color: #4cae4c; } + +.text-danger { + color: #D91E18; } + +.text-alert { + color: #F9BF3B; } + +.container { + max-width: 960px; } + +.page-header { + margin-top: 10px; } + +.alert { + margin-top: 20px; + border-radius: 0; + font-size: 1.2em; } + .alert.alert-success { + background-color: #8DCD8D; + border-color: #4cae4c; + color: white; } + .alert.alert-info { + background: #8CD3E8; + border-color: #46b8da; + color: #FFF; } + .alert.alert-danger { + background: #D91E18; + border-color: #CF000F; + color: #FFF; } + +.badge { + padding-top: 8px; + padding-bottom: 8px; + padding-left: 12px; + padding-right: 12px; } + .badge.badge-success { + background-color: #4cae4c; } + .badge.badge-info { + background-color: #46b8da; } + .badge.badge-warning { + background-color: #F27935; } + .badge.badge-alert { + background-color: #F9BF3B; } + .badge.badge-danger { + background-color: #CF000F; } + +.list-group { + margin-bottom: 20px; + padding-left: 0; + border-radius: 0; } + .list-group .list-group-item { + border-radius: 0; + background-color: #ffffff; + border: 1px solid #BDC3C7; + font-size: 1.1em; } + .list-group .list-group-item span.badge { + position: absolute; + top: 0; + right: 0; + border-radius: 0; + display: block; } + .list-group .list-group-item i.glyphicon { + font-size: 1.4em; } + .list-group .list-group-item h1, .list-group .list-group-item h2, .list-group .list-group-item h3, .list-group .list-group-item h4 { + margin-bottom: 2px; } + .list-group .list-group-item h4 { + font-weight: 400; + max-width: 90%; } + .list-group .list-group-item p, .list-group .list-group-item time { + margin-bottom: 0; + line-height: 1.3em; } + .list-group .list-group-item time { + color: #6C7A89; + font-weight: 600; + font-size: 1.1em; } + .list-group .list-group-item.active { + background-color: #F2F1EF; } + .list-group .list-group-item.active h3 { + color: #22313F; + padding-top: 6px; + padding-bottom: 6px; + font-weight: 300; + font-size: 1.6em; } + .list-group .list-group-item.active:hover { + color: inherit; + border-color: #BDC3C7; } + .list-group.components { + margin-bottom: 30px; } + .list-group.components p { + margin-bottom: 10px; } + .list-group.components .badge { + color: transparent; } diff --git a/public/build/css/application-c3c6ec34.css b/public/build/css/application-c3c6ec34.css deleted file mode 100755 index d02d3bf4..00000000 --- a/public/build/css/application-c3c6ec34.css +++ /dev/null @@ -1,37 +0,0 @@ -body { - color: #333333; - font-size: 1.4em; } - -hr { - margin-top: 10px; - margin-bottom: 10px; } - -.alert.alert-success { - background-color: #8DCD8D; - border-color: #4cae4c; - color: white; } -.alert.alert-info { - background: #8CD3E8; - border-color: #46b8da; - color: #FFF; } -.alert.alert-danger { - background: #D91E18; - border-color: #CF000F; - color: #FFF; } - -.list-group { - margin-bottom: 20px; - padding-left: 0; } - .list-group .list-group-item { - padding: 10px 15px; - background-color: #ffffff; - border: 1px solid #BDC3C7; } - .list-group .list-group-item h1.list-group-item-heading, .list-group .list-group-item h2.list-group-item-heading, .list-group .list-group-item h3.list-group-item-heading, .list-group .list-group-item h4.list-group-item-heading { - margin-top: 5px; - margin-bottom: 5px; } - .list-group .list-group-item p, .list-group .list-group-item time { - margin-bottom: 0; - line-height: 1.3em; } - .list-group .list-group-item time { - color: #6C7A89; - font-weight: bold; } diff --git a/public/build/css/application.css b/public/build/css/application.css index d02d3bf4..111dd246 100755 --- a/public/build/css/application.css +++ b/public/build/css/application.css @@ -1,37 +1,106 @@ body { color: #333333; - font-size: 1.4em; } + font-size: 1.4em; + font-weight: 300; } hr { margin-top: 10px; margin-bottom: 10px; } -.alert.alert-success { - background-color: #8DCD8D; - border-color: #4cae4c; - color: white; } -.alert.alert-info { - background: #8CD3E8; - border-color: #46b8da; - color: #FFF; } -.alert.alert-danger { - background: #D91E18; - border-color: #CF000F; - color: #FFF; } +h1 { + margin-bottom: 20px; } + +.text-success { + color: #4cae4c; } + +.text-danger { + color: #D91E18; } + +.text-alert { + color: #F9BF3B; } + +.container { + max-width: 960px; } + +.page-header { + margin-top: 10px; } + +.alert { + margin-top: 20px; + border-radius: 0; + font-size: 1.2em; } + .alert.alert-success { + background-color: #8DCD8D; + border-color: #4cae4c; + color: white; } + .alert.alert-info { + background: #8CD3E8; + border-color: #46b8da; + color: #FFF; } + .alert.alert-danger { + background: #D91E18; + border-color: #CF000F; + color: #FFF; } + +.badge { + padding-top: 8px; + padding-bottom: 8px; + padding-left: 12px; + padding-right: 12px; } + .badge.badge-success { + background-color: #4cae4c; } + .badge.badge-info { + background-color: #46b8da; } + .badge.badge-warning { + background-color: #F27935; } + .badge.badge-alert { + background-color: #F9BF3B; } + .badge.badge-danger { + background-color: #CF000F; } .list-group { margin-bottom: 20px; - padding-left: 0; } + padding-left: 0; + border-radius: 0; } .list-group .list-group-item { - padding: 10px 15px; + border-radius: 0; background-color: #ffffff; - border: 1px solid #BDC3C7; } - .list-group .list-group-item h1.list-group-item-heading, .list-group .list-group-item h2.list-group-item-heading, .list-group .list-group-item h3.list-group-item-heading, .list-group .list-group-item h4.list-group-item-heading { - margin-top: 5px; - margin-bottom: 5px; } + border: 1px solid #BDC3C7; + font-size: 1.1em; } + .list-group .list-group-item span.badge { + position: absolute; + top: 0; + right: 0; + border-radius: 0; + display: block; } + .list-group .list-group-item i.glyphicon { + font-size: 1.4em; } + .list-group .list-group-item h1, .list-group .list-group-item h2, .list-group .list-group-item h3, .list-group .list-group-item h4 { + margin-bottom: 2px; } + .list-group .list-group-item h4 { + font-weight: 400; + max-width: 90%; } .list-group .list-group-item p, .list-group .list-group-item time { margin-bottom: 0; line-height: 1.3em; } .list-group .list-group-item time { color: #6C7A89; - font-weight: bold; } + font-weight: 600; + font-size: 1.1em; } + .list-group .list-group-item.active { + background-color: #F2F1EF; } + .list-group .list-group-item.active h3 { + color: #22313F; + padding-top: 6px; + padding-bottom: 6px; + font-weight: 300; + font-size: 1.6em; } + .list-group .list-group-item.active:hover { + color: inherit; + border-color: #BDC3C7; } + .list-group.components { + margin-bottom: 30px; } + .list-group.components p { + margin-bottom: 10px; } + .list-group.components .badge { + color: transparent; } diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index a39b0c44..8130b101 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,3 +1,3 @@ { - "css/application.css": "css/application-c3c6ec34.css" + "css/application.css": "css/application-52640275.css" } \ No newline at end of file diff --git a/public/css/application.css b/public/css/application.css index d02d3bf4..111dd246 100755 --- a/public/css/application.css +++ b/public/css/application.css @@ -1,37 +1,106 @@ body { color: #333333; - font-size: 1.4em; } + font-size: 1.4em; + font-weight: 300; } hr { margin-top: 10px; margin-bottom: 10px; } -.alert.alert-success { - background-color: #8DCD8D; - border-color: #4cae4c; - color: white; } -.alert.alert-info { - background: #8CD3E8; - border-color: #46b8da; - color: #FFF; } -.alert.alert-danger { - background: #D91E18; - border-color: #CF000F; - color: #FFF; } +h1 { + margin-bottom: 20px; } + +.text-success { + color: #4cae4c; } + +.text-danger { + color: #D91E18; } + +.text-alert { + color: #F9BF3B; } + +.container { + max-width: 960px; } + +.page-header { + margin-top: 10px; } + +.alert { + margin-top: 20px; + border-radius: 0; + font-size: 1.2em; } + .alert.alert-success { + background-color: #8DCD8D; + border-color: #4cae4c; + color: white; } + .alert.alert-info { + background: #8CD3E8; + border-color: #46b8da; + color: #FFF; } + .alert.alert-danger { + background: #D91E18; + border-color: #CF000F; + color: #FFF; } + +.badge { + padding-top: 8px; + padding-bottom: 8px; + padding-left: 12px; + padding-right: 12px; } + .badge.badge-success { + background-color: #4cae4c; } + .badge.badge-info { + background-color: #46b8da; } + .badge.badge-warning { + background-color: #F27935; } + .badge.badge-alert { + background-color: #F9BF3B; } + .badge.badge-danger { + background-color: #CF000F; } .list-group { margin-bottom: 20px; - padding-left: 0; } + padding-left: 0; + border-radius: 0; } .list-group .list-group-item { - padding: 10px 15px; + border-radius: 0; background-color: #ffffff; - border: 1px solid #BDC3C7; } - .list-group .list-group-item h1.list-group-item-heading, .list-group .list-group-item h2.list-group-item-heading, .list-group .list-group-item h3.list-group-item-heading, .list-group .list-group-item h4.list-group-item-heading { - margin-top: 5px; - margin-bottom: 5px; } + border: 1px solid #BDC3C7; + font-size: 1.1em; } + .list-group .list-group-item span.badge { + position: absolute; + top: 0; + right: 0; + border-radius: 0; + display: block; } + .list-group .list-group-item i.glyphicon { + font-size: 1.4em; } + .list-group .list-group-item h1, .list-group .list-group-item h2, .list-group .list-group-item h3, .list-group .list-group-item h4 { + margin-bottom: 2px; } + .list-group .list-group-item h4 { + font-weight: 400; + max-width: 90%; } .list-group .list-group-item p, .list-group .list-group-item time { margin-bottom: 0; line-height: 1.3em; } .list-group .list-group-item time { color: #6C7A89; - font-weight: bold; } + font-weight: 600; + font-size: 1.1em; } + .list-group .list-group-item.active { + background-color: #F2F1EF; } + .list-group .list-group-item.active h3 { + color: #22313F; + padding-top: 6px; + padding-bottom: 6px; + font-weight: 300; + font-size: 1.6em; } + .list-group .list-group-item.active:hover { + color: inherit; + border-color: #BDC3C7; } + .list-group.components { + margin-bottom: 30px; } + .list-group.components p { + margin-bottom: 10px; } + .list-group.components .badge { + color: transparent; }