Merge pull request #13 from titouanfreville/cactus-v1

Cactus v1
titouanfreville · Nov 10, 2016 · fb4a62b · fb4a62b
2 parents 7e97d38 + 716cded
commit fb4a62b
Show file tree

Hide file tree

Showing 194 changed files with 729 additions and 1,680 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "cactusespacesverts/images"]
+	path = cactusespacesverts/images
+	url = [email protected]:titouanfreville/cactus_images.git
diff --git a/cactusespacesverts/bower.json b/cactusespacesverts/bower.json
@@ -21,7 +21,8 @@
     "angularjs-google-maps": "^0.5.0",
     "lodash": "^4.15.0",
     "angular-animate": "^1.5.8",
-    "ng-photoswipe": "^0.2.0"
+    "ng-photoswipe": "^0.2.0",
+    "font-awesome": "^4.7.0"
   },
   "resolutions": {
     "angular": "^1.5.8"

diff --git a/cactusespacesverts/cactusespacesverts.config b/cactusespacesverts/cactusespacesverts.config
@@ -1,6 +1,6 @@
 server {
 #  listen       80;
-  listen *:80; 
+  listen *:80;
   index index.html index.htm;
   server_name localhost cactusespacesverts.fr www.cactusespacesverts.fr cactus;
   #root   /cactus/http/cactusespacesverts/;

diff --git a/cactusespacesverts/css/default-skin/default-skin.css b/cactusespacesverts/css/default-skin/default-skin.css
diff --git a/cactusespacesverts/css/sass/_animations.scss b/cactusespacesverts/css/sass/_animations.scss
@@ -21,7 +21,7 @@
     height: 100px;
   }
   padding: 15px;  
-  margin: 0 auto 2em;  
+  padding: 0 auto 2em;
   border: 1px solid #ddd;  
   background: #FFF;  
   /* CSS3 effects */  

diff --git a/cactusespacesverts/css/sass/_body.scss b/cactusespacesverts/css/sass/_body.scss
@@ -5,19 +5,24 @@ body {
   @include tap-highlight-transparent();
   @include user-select(none);
   @include display-flex;
+  @include flex(1);
   @include flex-direction(column);
+  width: auto;
   word-wrap: break-word;
   line-height: 20px;
   -webkit-backface-visibility: hidden;
   -webkit-user-drag: none;
-  padding: 1%;
   margin: 0;
+  left: 0;
+  top: 0;
+  right: 0;
+  width: auto;
+  margin-right: 25px;
+  overflow-x: hidden;
   // configurable properties -------------
-  background: $background-img $background-color no-repeat;
-  background-size: cover;
-  background-attachment: fixed;
   font-family: $fonts;
-  font-size: 100%;
-  color: $base-font-color;
+  font-size: $baseFontSize;
+  color: $baseFontColor;
   line-height: 1.5;
+  //width: 1vm;
 }
diff --git a/cactusespacesverts/css/sass/_contact.scss b/cactusespacesverts/css/sass/_contact.scss
@@ -0,0 +1,3 @@
+.contact {
+  background: $contactBackgroundColor;
+}