Download as
Browse Code »

Commit cd4dd53295762200bf08e0f51e72a6cf7c1acf2c

Authored by Leonardo Merlin
1 parent 35304417
Exists in master and in 4 other branches build, build2, production, staging

Update style import (all in one file)

Showing 5 changed files with 215 additions and 25 deletions   Show diff stats
css/font-asap.css 0 → 100644
  Diff comments   View file @cd4dd53
... ... @@ -0,0 +1,32 @@
  1 +/* latin-ext */
  2 +@font-face {
  3 + font-family: 'Asap';
  4 + font-style: normal;
  5 + font-weight: 400;
  6 + src: local('Asap'), local('Asap-Regular'), url(http://fonts.gstatic.com/s/asap/v4/iadKCBVahjA5ul3LDhwH7A.woff2) format('woff2');
  7 + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
  8 +}
  9 +/* latin */
  10 +@font-face {
  11 + font-family: 'Asap';
  12 + font-style: normal;
  13 + font-weight: 400;
  14 + src: local('Asap'), local('Asap-Regular'), url(http://fonts.gstatic.com/s/asap/v4/oiVlPAjaPL0EznW3E5Z2DQ.woff2) format('woff2');
  15 + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
  16 +}
  17 +/* latin-ext */
  18 +@font-face {
  19 + font-family: 'Asap';
  20 + font-style: normal;
  21 + font-weight: 700;
  22 + src: local('Asap Bold'), local('Asap-Bold'), url(http://fonts.gstatic.com/s/asap/v4/ovPqj5yHJvE65V38pSjaNfY6323mHUZFJMgTvxaG2iE.woff2) format('woff2');
  23 + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
  24 +}
  25 +/* latin */
  26 +@font-face {
  27 + font-family: 'Asap';
  28 + font-style: normal;
  29 + font-weight: 700;
  30 + src: local('Asap Bold'), local('Asap-Bold'), url(http://fonts.gstatic.com/s/asap/v4/YUlqaYZPVSsAAN2ZtG3iyA.woff2) format('woff2');
  31 + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
  32 +}
... ...
css/font-asap.min.css 0 → 100644
  Diff comments   View file @cd4dd53
... ... @@ -0,0 +1 @@
  1 +@font-face{font-family:Asap;font-style:normal;font-weight:400;src:local('Asap'),local('Asap-Regular'),url(http://fonts.gstatic.com/s/asap/v4/iadKCBVahjA5ul3LDhwH7A.woff2) format('woff2');unicode-range:U+0100-024F,U+1E00-1EFF,U+20A0-20AB,U+20AD-20CF,U+2C60-2C7F,U+A720-A7FF}@font-face{font-family:Asap;font-style:normal;font-weight:400;src:local('Asap'),local('Asap-Regular'),url(http://fonts.gstatic.com/s/asap/v4/oiVlPAjaPL0EznW3E5Z2DQ.woff2) format('woff2');unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02C6,U+02DA,U+02DC,U+2000-206F,U+2074,U+20AC,U+2212,U+2215,U+E0FF,U+EFFD,U+F000}@font-face{font-family:Asap;font-style:normal;font-weight:700;src:local('Asap Bold'),local('Asap-Bold'),url(http://fonts.gstatic.com/s/asap/v4/ovPqj5yHJvE65V38pSjaNfY6323mHUZFJMgTvxaG2iE.woff2) format('woff2');unicode-range:U+0100-024F,U+1E00-1EFF,U+20A0-20AB,U+20AD-20CF,U+2C60-2C7F,U+A720-A7FF}@font-face{font-family:Asap;font-style:normal;font-weight:700;src:local('Asap Bold'),local('Asap-Bold'),url(http://fonts.gstatic.com/s/asap/v4/YUlqaYZPVSsAAN2ZtG3iyA.woff2) format('woff2');unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02C6,U+02DA,U+02DC,U+2000-206F,U+2074,U+20AC,U+2212,U+2215,U+E0FF,U+EFFD,U+F000}
0 2 \ No newline at end of file
... ...
css/open-sans.css 0 → 100644
  Diff comments   View file @cd4dd53
... ... @@ -0,0 +1,168 @@
  1 +/* cyrillic-ext */
  2 +@font-face {
  3 + font-family: 'Open Sans';
  4 + font-style: normal;
  5 + font-weight: 300;
  6 + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTa-j2U0lmluP9RWlSytm3ho.woff2) format('woff2');
  7 + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
  8 +}
  9 +/* cyrillic */
  10 +@font-face {
  11 + font-family: 'Open Sans';
  12 + font-style: normal;
  13 + font-weight: 300;
  14 + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTZX5f-9o1vgP2EXwfjgl7AY.woff2) format('woff2');
  15 + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
  16 +}
  17 +/* greek-ext */
  18 +@font-face {
  19 + font-family: 'Open Sans';
  20 + font-style: normal;
  21 + font-weight: 300;
  22 + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTRWV49_lSm1NYrwo-zkhivY.woff2) format('woff2');
  23 + unicode-range: U+1F00-1FFF;
  24 +}
  25 +/* greek */
  26 +@font-face {
  27 + font-family: 'Open Sans';
  28 + font-style: normal;
  29 + font-weight: 300;
  30 + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTaaRobkAwv3vxw3jMhVENGA.woff2) format('woff2');
  31 + unicode-range: U+0370-03FF;
  32 +}
  33 +/* vietnamese */
  34 +@font-face {
  35 + font-family: 'Open Sans';
  36 + font-style: normal;
  37 + font-weight: 300;
  38 + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTf8zf_FOSsgRmwsS7Aa9k2w.woff2) format('woff2');
  39 + unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
  40 +}
  41 +/* latin-ext */
  42 +@font-face {
  43 + font-family: 'Open Sans';
  44 + font-style: normal;
  45 + font-weight: 300;
  46 + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTT0LW-43aMEzIO6XUTLjad8.woff2) format('woff2');
  47 + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
  48 +}
  49 +/* latin */
  50 +@font-face {
  51 + font-family: 'Open Sans';
  52 + font-style: normal;
  53 + font-weight: 300;
  54 + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTegdm0LZdjqr5-oayXSOefg.woff2) format('woff2');
  55 + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
  56 +}
  57 +/* cyrillic-ext */
  58 +@font-face {
  59 + font-family: 'Open Sans';
  60 + font-style: normal;
  61 + font-weight: 400;
  62 + src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/K88pR3goAWT7BTt32Z01mxJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
  63 + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
  64 +}
  65 +/* cyrillic */
  66 +@font-face {
  67 + font-family: 'Open Sans';
  68 + font-style: normal;
  69 + font-weight: 400;
  70 + src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/RjgO7rYTmqiVp7vzi-Q5URJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
  71 + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
  72 +}
  73 +/* greek-ext */
  74 +@font-face {
  75 + font-family: 'Open Sans';
  76 + font-style: normal;
  77 + font-weight: 400;
  78 + src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/LWCjsQkB6EMdfHrEVqA1KRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
  79 + unicode-range: U+1F00-1FFF;
  80 +}
  81 +/* greek */
  82 +@font-face {
  83 + font-family: 'Open Sans';
  84 + font-style: normal;
  85 + font-weight: 400;
  86 + src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/xozscpT2726on7jbcb_pAhJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
  87 + unicode-range: U+0370-03FF;
  88 +}
  89 +/* vietnamese */
  90 +@font-face {
  91 + font-family: 'Open Sans';
  92 + font-style: normal;
  93 + font-weight: 400;
  94 + src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/59ZRklaO5bWGqF5A9baEERJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
  95 + unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
  96 +}
  97 +/* latin-ext */
  98 +@font-face {
  99 + font-family: 'Open Sans';
  100 + font-style: normal;
  101 + font-weight: 400;
  102 + src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/u-WUoqrET9fUeobQW7jkRRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
  103 + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
  104 +}
  105 +/* latin */
  106 +@font-face {
  107 + font-family: 'Open Sans';
  108 + font-style: normal;
  109 + font-weight: 400;
  110 + src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/cJZKeOuBrn4kERxqtaUH3VtXRa8TVwTICgirnJhmVJw.woff2) format('woff2');
  111 + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
  112 +}
  113 +/* cyrillic-ext */
  114 +@font-face {
  115 + font-family: 'Open Sans';
  116 + font-style: normal;
  117 + font-weight: 700;
  118 + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzK-j2U0lmluP9RWlSytm3ho.woff2) format('woff2');
  119 + unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
  120 +}
  121 +/* cyrillic */
  122 +@font-face {
  123 + font-family: 'Open Sans';
  124 + font-style: normal;
  125 + font-weight: 700;
  126 + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzJX5f-9o1vgP2EXwfjgl7AY.woff2) format('woff2');
  127 + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
  128 +}
  129 +/* greek-ext */
  130 +@font-face {
  131 + font-family: 'Open Sans';
  132 + font-style: normal;
  133 + font-weight: 700;
  134 + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzBWV49_lSm1NYrwo-zkhivY.woff2) format('woff2');
  135 + unicode-range: U+1F00-1FFF;
  136 +}
  137 +/* greek */
  138 +@font-face {
  139 + font-family: 'Open Sans';
  140 + font-style: normal;
  141 + font-weight: 700;
  142 + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzKaRobkAwv3vxw3jMhVENGA.woff2) format('woff2');
  143 + unicode-range: U+0370-03FF;
  144 +}
  145 +/* vietnamese */
  146 +@font-face {
  147 + font-family: 'Open Sans';
  148 + font-style: normal;
  149 + font-weight: 700;
  150 + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzP8zf_FOSsgRmwsS7Aa9k2w.woff2) format('woff2');
  151 + unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
  152 +}
  153 +/* latin-ext */
  154 +@font-face {
  155 + font-family: 'Open Sans';
  156 + font-style: normal;
  157 + font-weight: 700;
  158 + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzD0LW-43aMEzIO6XUTLjad8.woff2) format('woff2');
  159 + unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
  160 +}
  161 +/* latin */
  162 +@font-face {
  163 + font-family: 'Open Sans';
  164 + font-style: normal;
  165 + font-weight: 700;
  166 + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://fonts.gstatic.com/s/opensans/v13/k3k702ZOKiLJc3WVjuplzOgdm0LZdjqr5-oayXSOefg.woff2) format('woff2');
  167 + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
  168 +}
... ...
index.html
  Diff comments   View file @cd4dd53
... ... @@ -9,6 +9,8 @@
9 9 <meta property="og:title" content="Dialoga Brasil" />
10 10  
11 11 <link rel="icon" type="image/x-icon" href="data:image/png;base64,iVBORw0KGgo=">
  12 +
  13 + <link rel="stylesheet" href="style.css">
12 14  
13 15 <script type="text/javascript">
14 16 /**
... ... @@ -38,29 +40,6 @@
38 40  
39 41 })();
40 42  
41   - function makeCSSLink(filename){
42   - var fileref=document.createElement('link');
43   - fileref.setAttribute('rel', 'stylesheet');
44   - fileref.setAttribute('type', 'text/css');
45   - fileref.setAttribute('href', Url.addBaseUrl(filename));
46   - return fileref;
47   - }
48   - function loadCSSFiles(){
49   - var css_files = [
50   - 'css/bootstrap.min.css',
51   - 'css/bootstrap-alert.min.css',
52   - 'css/hover.custom.css',
53   - 'css/footable.core.min.css',
54   - 'http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css',
55   - 'http://fonts.googleapis.com/css?family=Open+Sans:400,300,700',
56   - 'http://fonts.googleapis.com/css?family=Asap:400,700',
57   - 'style.css'
58   - ];
59   - head = document.getElementsByTagName('head')[0]
60   - for(i = 0; i < css_files.length; i++){
61   - head.appendChild(makeCSSLink(css_files[i]));
62   - }
63   - }
64 43 function makeJSURL(filename){
65 44 var url = Url.addBaseUrl(filename);
66 45  
... ... @@ -111,8 +90,6 @@
111 90 if(!document.addEventListener){
112 91 loadOldBrowserWarn();
113 92 }
114   -
115   - loadCSSFiles();
116 93 </script>
117 94  
118 95 </head>
... ...
sass/style.sass
  Diff comments   View file @cd4dd53
1 1 // ------------------------------------
2 2 // Organização da folha de estilo:
3 3 //
  4 +// 0 - Dependências
4 5 // 1 - Variaveis
5 6 // 1.1 - espacamento
6 7 // 1.2 - arredondamento
... ... @@ -47,6 +48,17 @@
47 48  
48 49  
49 50 // ------------------------------------
  51 +// 0 - Dependências
  52 +// ------------------------------------
  53 +@import '../css/bootstrap.min.css'
  54 +@import '../css/bootstrap-alert.min.css'
  55 +@import '../css/hover.custom.css'
  56 +@import '../css/footable.core.min.css'
  57 +@import '../css/font-awesome.min.css'
  58 +@import '../css/open-sans.min.css'
  59 +@import '../css/font-asap.min.css'
  60 +
  61 +// ------------------------------------
50 62 // 1 - Variaveis
51 63 // ------------------------------------
52 64  
... ...