Merge branch 'develop'

scrapinghub · Apr 15, 2015 · 19b21b3 · 19b21b3
2 parents c2adedd + 9da3ed7
commit 19b21b3
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 8 deletions.
diff --git a/slybot/bin/makedeb b/slybot/bin/makedeb
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-version=$(python setup.py --version)-r$(git log --oneline | wc -l)+$(date +%Y%m%d%H%M)${BUILD_CODE:+~$BUILD_CODE}
+version=$(python setup.py --version)-r$(git log --oneline | wc -l)+$(date +%Y%m%d%H%M)~$(git rev-parse --short HEAD)${BUILD_CODE:+~$BUILD_CODE}
 debchange -m -D unstable --force-distribution -v $version "Automatic build"
 debuild --no-lintian -us -uc -b
diff --git a/slybot/slybot/__init__.py b/slybot/slybot/__init__.py
@@ -1 +1 @@
-__version__ = '0.9'
+__version__ = '0.10'
diff --git a/slyd/app/components/copy-clipboard.js b/slyd/app/components/copy-clipboard.js
@@ -4,7 +4,7 @@ export default ZeroClipboard.extend({
     layoutName: 'components/bs-button',
     tagName: 'button',
     classNameBindings: 'class',
-    class: 'btn btn-default btn-xs',
+    class: 'btn btn-default btn-xs btn-xs-size fa fa-icon fa-clipboard',
     icon: 'fa fa-icon fa-clipboard',
 
     actions: {

diff --git a/slyd/app/styles/app.css b/slyd/app/styles/app.css
@@ -635,7 +635,6 @@ a {
 }
 
 a:hover {
-    color: orange;
     text-decoration: underline;
 }
 
@@ -735,4 +734,19 @@ input[type="checkbox"].offset-checkbox {
 
 .spinner {
     animation: rotation 2s infinite;
+}
+
+#toolbox .panel-default > .panel-heading {
+    background-image: linear-gradient(to bottom, #888 0px, #8f8f8f 100%);
+    color: #EEE;
+    border-radius: 0px;
+}
+
+#toolbox .panel-group .panel, #toolbox .panel {
+    border-radius: 0px;
+}
+
+.btn-xs-size {
+    width: 23px;
+    height: 23px;
 }
diff --git a/...a-web-74ba04d16e41255fecb229daa777b2ff.js → ...a-web-8c3165fd4d4f6456456d3ae3c20d166f.js b/...a-web-74ba04d16e41255fecb229daa777b2ff.js → ...a-web-8c3165fd4d4f6456456d3ae3c20d166f.js
diff --git a/...-web-85465acf25d0e727fb87a4cd0e3727f7.css → ...-web-cd500586cf62a6a69692c14705745381.css b/...-web-85465acf25d0e727fb87a4cd0e3727f7.css → ...-web-cd500586cf62a6a69692c14705745381.css
diff --git a/slyd/dist/index.html b/slyd/dist/index.html
@@ -11,15 +11,15 @@
 <meta name="portia-web/config/environment" content="%7B%22modulePrefix%22%3A%22portia-web%22%2C%22environment%22%3A%22production%22%2C%22baseURL%22%3A%22/%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%7D%2C%22contentSecurityPolicyHeader%22%3A%22Content-Security-Policy-Report-Only%22%2C%22contentSecurityPolicy%22%3A%7B%22default-src%22%3A%22%27none%27%22%2C%22script-src%22%3A%22%27self%27%22%2C%22font-src%22%3A%22%27self%27%22%2C%22connect-src%22%3A%22%27self%27%22%2C%22img-src%22%3A%22%27self%27%22%2C%22style-src%22%3A%22%27self%27%22%2C%22media-src%22%3A%22%27self%27%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
 
     <link rel="stylesheet" href="assets/vendor-496affb9d6de60dbf38bf38e1f52b4cb.css">
-    <link rel="stylesheet" href="assets/portia-web-85465acf25d0e727fb87a4cd0e3727f7.css">
+    <link rel="stylesheet" href="assets/portia-web-cd500586cf62a6a69692c14705745381.css">
 
 
   </head>
   <body>
 
 
     <script src="assets/vendor-513622e045d02afb7667d4f46d744c2b.js"></script>
-    <script src="assets/portia-web-74ba04d16e41255fecb229daa777b2ff.js"></script>
+    <script src="assets/portia-web-8c3165fd4d4f6456456d3ae3c20d166f.js"></script>
 
 
   </body>