Cleaning up artefacts from merge errors

flowerncsu · Nov 11, 2013 · 58328df · 58328df
1 parent 2d7ecc6
commit 58328df
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 161 deletions.
diff --git a/sthlm/Gruntfile.js b/sthlm/Gruntfile.js
@@ -20,19 +20,8 @@ module.exports = function (grunt) {
 
     // configurable paths
     var yeomanConfig = {
-<<<<<<< HEAD
-<<<<<<< HEAD
-        app: 'www',
-        dist: '_site',
-        deploy: '../../PyladiesSthlm.github.io'
-=======
         app: 'src',
         dist: '_site'
->>>>>>> 99253b1... Moving www to src
-=======
-        app: 'src',
-        dist: '_site'
->>>>>>> 544ce1c... Correct Bower components location
     };
 
     grunt.initConfig({
@@ -42,28 +31,18 @@ module.exports = function (grunt) {
                 command: 'mynt gen -f src _site'
             },
             mynt: {                      // Target
-<<<<<<< HEAD
-<<<<<<< HEAD
-                command: 'mynt gen -f www .tmp'
+                command: 'mynt gen -f src .tmp'
             },
-            deploy: {
+            update: {
                 command: [
-                    'git add --all',
-                    'git commit -m "Automatic commit from main repository"',
-                    'git push'
+                    'npm update',
+                    'bower update',
+                    'bundle update',
+                    'pip install -r "requirements.txt"'
                 ].join('&&'),
                 options: {
-                    stdout: true,
-                    execOptions: {
-                        cwd: '<%= yeoman.deploy %>'
-                    }
+                    stdout: true
                 }
-=======
-                command: 'mynt gen -f src .tmp'
->>>>>>> 99253b1... Moving www to src
-=======
-                command: 'mynt gen -f src .tmp'
->>>>>>> 544ce1c... Correct Bower components location
             }
         },
         watch: {
@@ -447,4 +426,8 @@ module.exports = function (grunt) {
         'test',
         'build'
     ]);
+
+    grunt.registerTask('update', [
+        'shell:update'
+    ]);
 };
diff --git a/sthlm/src/_assets/css/_sass/_app.scss b/sthlm/src/_assets/css/_sass/_app.scss
@@ -54,50 +54,22 @@ body {
 }
 
 .icons {
-<<<<<<< HEAD
   font-size: 20px;
+  list-style: none;
+  padding-left: 0;
 
-<<<<<<< HEAD
-.icons > a, .icons > a:hover {
-  display: inline-block;
-  margin: 6px;
-  text-decoration: none;
-=======
-    > div {
-=======
-    list-style: none;
-    padding-left: 0;
     li {
->>>>>>> c779ecb... Changing icons to list
       display: inline-block;
       margin: 6px;
     }
->>>>>>> 5ee3b2f... Refactoring HTML to be more semantic
-}
-
-<<<<<<< HEAD
-a.icon-twitter, a.icon-twitter:hover {
-  color: #20ABD3;
-}
-
-a.icon-facebook, a.icon-facebook:hover {
-  color: #4B6498;
-}
-
-a.icon-meetup, a.icon-meetup:hover {
-  color: #E51938;
 }
 
-a.icon-github-circled, a.icon-github-circled:hover {
-  color: black;
-=======
 [class^="icon-"] {
     @extend %ir;
     &:before {
         font-size: 20px;
         @extend %social-icons;
     }
->>>>>>> c779ecb... Changing icons to list
 }
 
 /* Custom page footer */

diff --git a/sthlm/src/_assets/css/_sass/vendor/_bootstrap.scss b/sthlm/src/_assets/css/_sass/vendor/_bootstrap.scss
@@ -9,6 +9,7 @@
  */
 
 // Core variables and mixins
+@import "sass-bootstrap/lib/variables";
 @import "sass-bootstrap/lib/mixins";
 
 // Reset
@@ -26,10 +27,6 @@
 
 // Components
 @import "sass-bootstrap/lib/component-animations";
-<<<<<<< HEAD
-// @import "sass-bootstrap/lib/glyphicons";
-=======
->>>>>>> 0b0509f... making a mixin of social media icons
 @import "sass-bootstrap/lib/dropdowns";
 @import "sass-bootstrap/lib/button-groups";
 @import "sass-bootstrap/lib/input-groups";

diff --git a/sthlm/src/_templates/header.html b/sthlm/src/_templates/header.html
@@ -14,12 +14,6 @@
 <!-- Main CSS -->
 <link href="{{ get_asset('css/main.css') }}" rel="stylesheet">
 
-<<<<<<< HEAD
-<!-- Fontello font-->
-<link href="{{ get_asset('css/fontello.css') }}" rel="stylesheet">
-
-=======
->>>>>>> f04e3b2... Adding bootstrap sass
 <!-- Favicons -->
 <link rel="shortcut icon" href="{{ get_asset('images/favicon.ico') }}" type="image/x-icon">
 

diff --git a/sthlm/src/_templates/social-buttons.html b/sthlm/src/_templates/social-buttons.html
@@ -1,11 +1,4 @@
 <div class="container social-buttons">
-<<<<<<< HEAD
-  <div class="icons">
-      <a target="_blank" href="https://twitter.com/PyladiesSthlm/" class="icon-twitter" title="twitter"></a>
-      <a target="_blank" href="http://www.meetup.com/PyLadiesStockholm/" class="icon-meetup" title="meetup"></a>
-      <a target="_blank" href="https://github.com/PyladiesSthlm/" class="icon-github-circled" title="github"></a>
-  </div>
-=======
   <ul class="icons">
     <li>
       <a target="_blank" href="https://twitter.com/PyladiesSthlm/">
@@ -23,5 +16,4 @@
       </a>
     </li>
   </ul>
->>>>>>> c779ecb... Changing icons to list
 </div>
diff --git a/sthlm/www/_assets/css/_sass/_animation.scss b/sthlm/www/_assets/css/_sass/_animation.scss