Commit a7d29b56 by Félicie

mini fixes

parent 76df5a5e
...@@ -15,7 +15,7 @@ Créer une database mySQL ...@@ -15,7 +15,7 @@ Créer une database mySQL
- *option si avec MAMP (si sans utilisation de MAMP, passer au deuxième point)* - *option si avec MAMP (si sans utilisation de MAMP, passer au deuxième point)*
1. *Ouvrir MAMP* 1. *Ouvrir MAMP*
2. *Activer le serveur* 2. *Activer le serveur*
3. *Ouvrir le terminal pour ouvrir my SQL : `/Applications/MAMP/Library/bin/mysql --host=localhost -uroot -proot`* 3. *Ouvrir le terminal pour ouvrir my SQL : `/Applications/MAMP/Library/bin/mysql --host=localhost -u root -proot`*
- créer une database mySQL - créer une database mySQL
1. `CREATE DATABASE openbarlacagette;` 1. `CREATE DATABASE openbarlacagette;`
2. `CREATE USER 'lacagette'@'localhost' IDENTIFIED BY 'cagette2015';` 2. `CREATE USER 'lacagette'@'localhost' IDENTIFIED BY 'cagette2015';`
......
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
'vote_down_popup' => 'Voter contre', 'vote_down_popup' => 'Voter contre',
'vote_limit' => 'Trop de votes reçus - merci d\'essayer à nouveau dans quelques instants ', 'vote_limit' => 'Trop de votes reçus - merci d\'essayer à nouveau dans quelques instants ',
'vote_must_confirm' => '^5Confirme ton adresse e-mail^6 pour voter.', 'vote_must_confirm' => '^5Confirme ton adresse e-mail^6 pour voter.',
'vote_must_login' => '^1Connectes-toi^2 pour voter.', 'vote_must_login' => '^1Connecte-toi^2 pour voter.',
'vote_not_allowed' => 'Voter ici n\'est pas permis', 'vote_not_allowed' => 'Voter ici n\'est pas permis',
'vote_up_popup' => 'Voter pour', 'vote_up_popup' => 'Voter pour',
'voted_down_popup' => 'Tu as voté contre - clique pour supprimer ton vote ', 'voted_down_popup' => 'Tu as voté contre - clique pour supprimer ton vote ',
......
...@@ -96,6 +96,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;} ...@@ -96,6 +96,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
padding: 0.5em; padding: 0.5em;
float:left; float:left;
margin-top: 1em; margin-top: 1em;
margin-bottom: 1em;
clear:left; clear:left;
overflow:hidden; overflow:hidden;
width: 70vw; width: 70vw;
...@@ -115,7 +116,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;} ...@@ -115,7 +116,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
color: #00A473 color: #00A473
} }
.qa-main-hidden h1 {color:#999;} .qa-main-hidden h1 {color:#999;}
.qa-footer {clear:both; background:#00A473; color:#FFF; font-size:10px; padding:12px;} .qa-footer {clear:both; background:#00A473; color:#FFF; font-size:0.8rem; padding:12px;}
* html .qa-footer {padding-top:6px;} /* IE6 */ * html .qa-footer {padding-top:6px;} /* IE6 */
/* Widget wrappers */ /* Widget wrappers */
...@@ -217,7 +218,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;} ...@@ -217,7 +218,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
/* Standard form (tall version) */ /* Standard form (tall version) */
.qa-form-tall-table { .qa-form-tall-table {
width: 70vw; width: 67vw;
box-shadow: 2px 2px 3px rgb(10 10 10 / 10%), 0 0 0 1px rgb(10 10 10 / 10%); box-shadow: 2px 2px 3px rgb(10 10 10 / 10%), 0 0 0 1px rgb(10 10 10 / 10%);
border-radius: 30px; border-radius: 30px;
margin: 1rem; margin: 1rem;
...@@ -227,7 +228,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;} ...@@ -227,7 +228,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
@media screen and (max-width: 1000px) { @media screen and (max-width: 1000px) {
.qa-form-tall-table { .qa-form-tall-table {
width: 85vw; width: 83vw;
} }
} }
...@@ -370,11 +371,11 @@ h2 {font-size:16px; padding-top:12px; clear:both;} ...@@ -370,11 +371,11 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
} }
.qa-q-item-main { .qa-q-item-main {
width: 65vw; width: 66vw;
} }
@media screen and (max-width: 1100px) { @media screen and (max-width: 1000px) {
.qa-q-item-main { .qa-q-item-main {
width: 80vw; width: 80vw;
} }
...@@ -649,11 +650,11 @@ h2 {font-size:16px; padding-top:12px; clear:both;} ...@@ -649,11 +650,11 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
.qa-nav-footer-list {float:left; list-style-type:none; padding:0; margin:0;} .qa-nav-footer-list {float:left; list-style-type:none; padding:0; margin:0;}
.qa-nav-footer-item {float:left; margin-right:12px;} .qa-nav-footer-item {float:left; margin-right:12px;}
.qa-nav-footer-link {color:#FFF; text-decoration:underline !important;} .qa-nav-footer-link {color:#FFF; text-decoration:none;}
.qa-nav-footer-link:hover {color:#f5d495;} .qa-nav-footer-link:hover {color:#9cdbce;}
.qa-attribution {float:right;} .qa-attribution {float:right;}
.qa-attribution a {color:#FFF; text-decoration:underline !important;} .qa-attribution a {color:#FFF; text-decoration:none;}
.qa-attribution a:hover {color:#f5d495;} .qa-attribution a:hover {color:#9cdbce;}
/* Classes in HTML passed to theme class */ /* Classes in HTML passed to theme class */
......
...@@ -68,22 +68,22 @@ class qa_html_theme extends qa_html_theme_base ...@@ -68,22 +68,22 @@ class qa_html_theme extends qa_html_theme_base
$this->output_array(array( $this->output_array(array(
"<style>", "<style>",
"@font-face {", "@font-face {",
" font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; font-weight: normal; font-style: normal;", " font-family: 'Ubuntu'; font-weight: normal; font-style: normal;",
" src: local('Ubuntu'),", " src: local('Ubuntu'),",
" url('{$this->rooturl}fonts/ubuntu-regular.woff2') format('woff2'), url('{$this->rooturl}fonts/ubuntu-regular.woff') format('woff');", " url('{$this->rooturl}fonts/ubuntu-regular.woff2') format('woff2'), url('{$this->rooturl}fonts/ubuntu-regular.woff') format('woff');",
"}", "}",
"@font-face {", "@font-face {",
" font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; font-weight: bold; font-style: normal;", " font-family: 'Ubuntu'; font-weight: normal; font-style: normal;",
" src: local('Ubuntu Bold'), local('Ubuntu-Bold'),", " src: local('Ubuntu Bold'), local('Ubuntu-Bold'),",
" url('{$this->rooturl}fonts/ubuntu-bold.woff2') format('woff2'), url('{$this->rooturl}fonts/ubuntu-bold.woff') format('woff');", " url('{$this->rooturl}fonts/ubuntu-bold.woff2') format('woff2'), url('{$this->rooturl}fonts/ubuntu-bold.woff') format('woff');",
"}", "}",
"@font-face {", "@font-face {",
" font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; font-weight: normal; font-style: italic;", " font-family: 'Ubuntu'; font-weight: normal; font-style: normal;",
" src: local('Ubuntu Italic'), local('Ubuntu-Italic'),", " src: local('Ubuntu Italic'), local('Ubuntu-Italic'),",
" url('{$this->rooturl}fonts/ubuntu-italic.woff2') format('woff2'), url('{$this->rooturl}fonts/ubuntu-italic.woff') format('woff');", " url('{$this->rooturl}fonts/ubuntu-italic.woff2') format('woff2'), url('{$this->rooturl}fonts/ubuntu-italic.woff') format('woff');",
"}", "}",
"@font-face {", "@font-face {",
" font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; font-weight: bold; font-style: italic;", " font-family: 'Ubuntu'; font-weight: normal; font-style: normal;",
" src: local('Ubuntu Bold Italic'), local('Ubuntu-BoldItalic'),", " src: local('Ubuntu Bold Italic'), local('Ubuntu-BoldItalic'),",
" url('{$this->rooturl}fonts/ubuntu-bold-italic.woff2') format('woff2'), url('{$this->rooturl}fonts/ubuntu-bold-italic.woff') format('woff');", " url('{$this->rooturl}fonts/ubuntu-bold-italic.woff2') format('woff2'), url('{$this->rooturl}fonts/ubuntu-bold-italic.woff') format('woff');",
"}", "}",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment