From c72c8729f57f31b193bb7896f673a8c199f4c455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrb=C3=A1=C4=8D?= <david@hrbac.cz>
Date: Thu, 12 Jan 2017 16:30:18 +0100
Subject: [PATCH] modified colors.sh script
---
colors.sh | 6 +++---
mkdocs.yml | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/colors.sh b/colors.sh
index 4a7b256e9..3336f5101 100644
--- a/colors.sh
+++ b/colors.sh
@@ -1,13 +1,13 @@
for i in {"red","pink","purple","deep purple","indigo","blue","light blue","cyan","teal","green","light green","lime","yellow","amber","orange","deep orange","brown","grey","blue grey"}
do
+ git pull --rebase origin colors
+ git pull --rebase
echo "Setting color to: $i, ${i/ /_}, color_${i/ /_}"
#git checkout -b color_${i/ /_}
git checkout color_${i/ /_}
sed -ri "s/(primary: ').*'/\1$i'/" mkdocs.yml
#git cherry-pick bd8e358
- #git commit -am "Setting color to: $i"
- git pull --rebase origin colors
- git pull --rebase
+ git commit -am "Setting color to: $i"
git push --set-upstream origin color_${i/ /_}
git checkout colors
done
diff --git a/mkdocs.yml b/mkdocs.yml
index e543cfa1c..d12c69d6a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -190,8 +190,13 @@ pages:
extra:
logo: img/logo2.png
palette:
- primary: 'purple'
+<<<<<<< HEAD
+ primary: 'blue grey'
accent: 'light blue'
+=======
+ primary: 'blue grey'
+ accent: 'red'
+>>>>>>> Setting color to: red
font:
text: 'Roboto'
code: 'Roboto Mono'
--
GitLab