diff --git a/README.md b/README.md index 201b9fd..88fa8aa 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # Description -UX DOT GOV is a conference about Ease of use for citizens, Usability for government administration systems and e-government and it's importance. Additionally, the sessions feature topics covering user experience design and its importance and implication in the real world alongside talks focusing on Privacy in the digital age. - -This is currently a temp landing page for the conference website. +This is currently a temp landing page for the uxdotgov website. # Get up and running @@ -12,6 +10,4 @@ Run `npm install` to get all the required modules that start, watch, compile sas `grunt min` minifies all images in the `img` folder. -`grunt smash` compiles everything and minifies images and code. - -Note that ga.js is purposefully not included in git to keep analytics IDs private. +Note that ga.js is purposefully not included. diff --git a/css/defaults-and-helpers.css b/css/defaults-and-helpers.css deleted file mode 100644 index 98350f7..0000000 --- a/css/defaults-and-helpers.css +++ /dev/null @@ -1,160 +0,0 @@ -html { - color: #474747; - font-size: 1em; - line-height: 1.4; } - -body { - margin: 0; - padding: 0 0 50px 0; - font-family: 'PT Sans', sans-serif; - background-color: #E8E8E8; } - -::-moz-selection { - background: #b3d4fc; - text-shadow: none; } - -::selection { - background: #b3d4fc; - text-shadow: none; } - -hr { - display: block; - height: 1px; - border: 0; - border-top: 1px solid #ccc; - margin: 1em 0; - padding: 0; } - -a { - color: inherit; - text-decoration: none; - font-weight: 500; - color: #41657B; - border-bottom: 1px solid #CBAFC9; } - -a:focus, -a:hover { - border-color: #8D53A0; - color: #065D93; } - -/* - * Remove the gap between audio, canvas, iframes, - * images, videos and the bottom of their containers: - * https://github.com/h5bp/html5-boilerplate/issues/440 - */ -audio, -canvas, -iframe, -img, -svg, -video { - vertical-align: middle; } - -/* - * Remove default fieldset styles. - */ -fieldset { - border: 0; - margin: 0; - padding: 0; } - -/* - * Allow only vertical resizing of textareas. - */ -textarea { - resize: vertical; } - -.hidden { - display: none !important; } - -.visuallyhidden { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; } - -.invisible { - visibility: hidden; } - -/* - * Clearfix: contain floats - * - * For modern browsers - * 1. The space content is one way to avoid an Opera bug when the - * `contenteditable` attribute is included anywhere else in the document. - * Otherwise it causes space to appear at the top and bottom of elements - * that receive the `clearfix` class. - * 2. The use of `table` rather than `block` is only necessary if using - * `:before` to contain the top-margins of child elements. - */ -.clearfix:before, -.clearfix:after { - content: " "; - /* 1 */ - display: table; - /* 2 */ } - -.clearfix:after { - clear: both; } - -@media print { - *, - *:before, - *:after { - background: transparent !important; - color: #000 !important; - /* Black prints faster: - http://www.sanbeiji.com/archives/953 */ - box-shadow: none !important; - text-shadow: none !important; } - - a, - a:visited { - text-decoration: underline; } - - a[href]:after { - content: " (" attr(href) ")"; } - - abbr[title]:after { - content: " (" attr(title) ")"; } - - /* - * Don't show links that are fragment identifiers, - * or use the `javascript:` pseudo protocol - */ - a[href^="#"]:after, - a[href^="javascript:"]:after { - content: ""; } - - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; } - - /* - * Printing Tables: - * http://css-discuss.incutio.com/wiki/Printing_Tables - */ - thead { - display: table-header-group; } - - tr, - img { - page-break-inside: avoid; } - - img { - max-width: 100% !important; } - - p, - h2, - h3 { - orphans: 3; - widows: 3; } - - h2, - h3 { - page-break-after: avoid; } } diff --git a/css/temp-page.css b/css/temp-page.css deleted file mode 100644 index 77549c0..0000000 --- a/css/temp-page.css +++ /dev/null @@ -1,68 +0,0 @@ -/* -Error: Undefined variable: "$udg-blue". - on line 5 of css/temp-page.scss - -1: /*header*\/ -2: -3: .hero { -4: height: 546px; -5: background: $udg-blue; -6: position: relative; -7: text-align: center; -8: box-sizing: border-box; -9: padding-top: 250px; -10: } - -Backtrace: -css/temp-page.scss:5 -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/script/tree/variable.rb:49:in `_perform' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/script/tree/node.rb:50:in `perform' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:384:in `visit_prop' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:36:in `visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:158:in `block in visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/stack.rb:79:in `block in with_base' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/stack.rb:115:in `with_frame' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/stack.rb:79:in `with_base' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:158:in `visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:420:in `block (2 levels) in visit_rule' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:420:in `map' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:420:in `block in visit_rule' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:179:in `with_environment' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:418:in `visit_rule' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:36:in `visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:158:in `block in visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/stack.rb:79:in `block in with_base' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/stack.rb:115:in `with_frame' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/stack.rb:79:in `with_base' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:158:in `visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:52:in `block in visit_children' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:52:in `map' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:52:in `visit_children' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:167:in `block in visit_children' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:179:in `with_environment' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:166:in `visit_children' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:36:in `block in visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:186:in `visit_root' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:36:in `visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:157:in `visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:8:in `visit' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/root_node.rb:36:in `css_tree' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/tree/root_node.rb:20:in `render' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/engine.rb:268:in `render' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:492:in `update_stylesheet' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:209:in `each' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:209:in `update_stylesheets' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:470:in `on_file_changed' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:328:in `block in watch' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/listen-2.8.5/lib/listen/listener.rb:282:in `call' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/listen-2.8.5/lib/listen/listener.rb:282:in `_process_changes' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/listen-2.8.5/lib/listen/listener.rb:246:in `block in _wait_for_changes' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/listen-2.8.5/lib/listen/listener.rb:229:in `loop' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/listen-2.8.5/lib/listen/listener.rb:229:in `_wait_for_changes' -/home/astoychev/.rbenv/versions/2.2.0/lib/ruby/gems/2.2.0/gems/listen-2.8.5/lib/listen/listener.rb:318:in `block in _start_wait_thread' -*/ -body:before { - white-space: pre; - font-family: monospace; - content: "Error: Undefined variable: \"$udg-blue\".\A on line 5 of css/temp-page.scss\A \A 1: /*header*/\A 2: \A 3: .hero {\A 4: height: 546px;\A 5: background: $udg-blue;\A 6: position: relative;\A 7: text-align: center;\A 8: box-sizing: border-box;\A 9: padding-top: 250px;\A 10: }"; } diff --git a/english.html b/english.html index 724ccb1..3383634 100644 --- a/english.html +++ b/english.html @@ -51,13 +51,12 @@