Merge pull request #240 from sgmap/new_style

New style

.scss-lint.yml

@@ -1,3 +1,5 @@
+exclude: 'app/assets/stylesheets/reset.scss'
+
 linters:
   BangFormat:
     enabled: true

app/assets/stylesheets/application.scss

@@ -12,7 +12,47 @@
 // defined in the other CSS/SCSS files in this directory. It is generally better to create a new
 // file per style scope.
 //
-// = require_tree .
+// = require _card
+// = require _colors
+// = require _constants
+// = require _helpers
+// = require _mixins
+// = require _placeholders
+// = require _turbolinks
+// = require _typography
+// = require admin_procedures_modal
+// = require admin_type_de_champ
+// = require backoffice
+// = require carte
+// = require cgu
+// = require custom_mails
+// = require default_data_block
+// = require description
+// = require dossier_show
+// = require dossiers
+// = require etapes
+// = require fonts
+// = require france_connect_particulier
+// = require landing
+// = require left_panel
+// = require login
+// = require main_container
+// = require navbar
+// = require notification_alert
+// = require pieces_justificatives_fields
+// = require pj_modal
+// = require pref_list_menu
+// = require print
+// = require procedure
+// = require recapitulatif
+// = require search
+// = require siret
+// = require stats
+// = require support_navigator_banner
+// = require switch_menu
+// = require typeahead
+// = require users
+
 // = require_self
 // = require bootstrap-datepicker3
 // = require leaflet

app/assets/stylesheets/common.scss

@@ -0,0 +1,7 @@
+@import "typography";
+
+body {
+  @extend %new-type;
+  font-size: 16px;
+  line-height: 1.42857143;
+}

app/assets/stylesheets/custom_reset.scss

@@ -0,0 +1,27 @@
+html,
+body {
+  height: 100%;
+}
+
+html {
+  box-sizing: border-box;
+}
+
+*,
+*::before,
+*::after {
+  box-sizing: inherit;
+}
+
+a {
+  text-decoration: none;
+}
+
+// remove dotted outline on firefox
+:focus {
+  outline: none;
+}
+
+::-moz-focus-inner {
+  border: none;
+}

app/assets/stylesheets/landing.scss

@@ -2,10 +2,8 @@
 @import "colors";
 @import "mixins";
 @import "placeholders";
-@import "typography";
 
 .landing {
-  @extend %new-type;
   background-color: #FFFFFF;
 }
 

app/assets/stylesheets/new_application.scss

@@ -0,0 +1,9 @@
+// = require reset
+// = require custom_reset
+// = require common
+// = require utils
+// = require fonts
+// = require new_header
+// = require new_footer
+// = require landing
+// = require navbar

app/assets/stylesheets/new_footer.scss

@@ -1,10 +1,9 @@
+@import "colors";
 @import "constants";
 @import "mixins";
 @import "placeholders";
-@import "typography";
 
 .footer {
-  @extend %new-type;
   @include vertical-padding(72px);
   background-color: $light-grey;
 }

app/assets/stylesheets/new_header.scss

@@ -1,15 +1,11 @@
 @import "constants";
 @import "colors";
 @import "mixins";
-@import "typography";
 
 // FIXME: Rename when the header is generalized
 .new-header {
-  @extend %new-type;
   height: 72px;
   background-color: #FFFFFF;
-  // FIXME: Delete when the header is generalized
-  margin-top: -60px;
 }
 
 .header-inner-content {

app/assets/stylesheets/reset.scss

@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/ 
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+	vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure, 
+footer, header, hgroup, menu, nav, section {
+	display: block;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}

app/assets/stylesheets/utils.scss

@@ -0,0 +1,11 @@
+.pull-left {
+  float: left;
+}
+
+.pull-right {
+  float: right;
+}
+
+.clearfix {
+  clear: both;
+}

app/views/layouts/new_application.html.haml

@@ -13,7 +13,7 @@
     = favicon_link_tag(image_url("favicons/32x32.png"), type: "image/png", sizes: "32x32")
     = favicon_link_tag(image_url("favicons/96x96.png"), type: "image/png", sizes: "96x96")
 
-    = stylesheet_link_tag "application", :media => "all", "data-turbolinks-track" => true
+    = stylesheet_link_tag "new_application", :media => "all", "data-turbolinks-track" => true
     = stylesheet_link_tag "print", :media => "print", "data-turbolinks-track" => true
 
   %body

config/initializers/assets.rb

@@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w(print.css)
+Rails.application.config.assets.precompile += %w(print.css new_application.css)