Mercurial Mercurial > corpus_parole / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove double sroll control in i.e. and edge
authorymh <ymh.work@gmail.com>
Wed, 21 Dec 2016 15:23:00 +0100
changeset 483 b47da9606c10
parent 482 3ea05479ce17
child 484 4dab0495f922
remove double sroll control in i.e. and edge
build/build.sh file | annotate | diff | comparison | revisions
build/build_puppet.sh file | annotate | diff | comparison | revisions
cms/app-client/app/styles/components/sorting-component.scss file | annotate | diff | comparison | revisions 
--- a/build/build.sh	Tue Dec 20 23:42:48 2016 +0100
+++ b/build/build.sh	Wed Dec 21 15:23:00 2016 +0100
@@ -160,16 +160,18 @@
 
 pushd "$DIR/dist" > /dev/null
 
-rm -f corpusdelaparole-back_*_*.tar.gz
-ARCHIVE_NAME="corpusdelaparole-back_$(date +%Y-%m-%d)_${version}"
+if [ -f bootstrap-puppet.sh -a -f corpusdelaparole-$version-*.noarch.rpm -a -f installDrupal.sh -a -f puppet-corpusdelaparole-$version-*.noarch.rpm ]; then
+    rm -f corpusdelaparole-back_*_*.tar.gz
+    ARCHIVE_NAME="corpusdelaparole-back_$(date +%Y-%m-%d)_${version}"
 
-mkdir "$ARCHIVE_NAME"
+    mkdir "$ARCHIVE_NAME"
 
-cp bootstrap-puppet.sh corpusdelaparole-$version-*.noarch.rpm installDrupal.sh puppet-corpusdelaparole-$version-*.noarch.rpm "$ARCHIVE_NAME"
+    cp bootstrap-puppet.sh corpusdelaparole-$version-*.noarch.rpm installDrupal.sh puppet-corpusdelaparole-$version-*.noarch.rpm "$ARCHIVE_NAME"
 
-tar zcvf "${ARCHIVE_NAME}.tar.gz" "$ARCHIVE_NAME"
+    tar zcvf "${ARCHIVE_NAME}.tar.gz" "$ARCHIVE_NAME"
 
-rm -fr "$ARCHIVE_NAME"
+    rm -fr "$ARCHIVE_NAME"
+fi
 
 popd > /dev/null
 
--- a/build/build_puppet.sh	Tue Dec 20 23:42:48 2016 +0100
+++ b/build/build_puppet.sh	Wed Dec 21 15:23:00 2016 +0100
@@ -107,16 +107,18 @@
 
 pushd "$DIR/dist" > /dev/null
 
-rm -f corpusdelaparole-back_*_*.tar.gz
-ARCHIVE_NAME="corpusdelaparole-back_$(date +%Y-%m-%d)_${version}"
+if [ -f bootstrap-puppet.sh -a -f corpusdelaparole-$version-*.noarch.rpm -a -f installDrupal.sh -a -f puppet-corpusdelaparole-$version-*.noarch.rpm ]; then
+    rm -f corpusdelaparole-back_*_*.tar.gz
+    ARCHIVE_NAME="corpusdelaparole-back_$(date +%Y-%m-%d)_${version}"
 
-mkdir "$ARCHIVE_NAME"
+    mkdir "$ARCHIVE_NAME"
 
-cp bootstrap-puppet.sh corpusdelaparole-$version-*.noarch.rpm installDrupal.sh puppet-corpusdelaparole-$version-*.noarch.rpm "$ARCHIVE_NAME"
+    cp bootstrap-puppet.sh corpusdelaparole-$version-*.noarch.rpm installDrupal.sh puppet-corpusdelaparole-$version-*.noarch.rpm "$ARCHIVE_NAME"
 
-tar zcvf "${ARCHIVE_NAME}.tar.gz" "$ARCHIVE_NAME"
+    tar zcvf "${ARCHIVE_NAME}.tar.gz" "$ARCHIVE_NAME"
 
-rm -fr "$ARCHIVE_NAME"
+    rm -fr "$ARCHIVE_NAME"
+fi
 
 popd > /dev/null
 
--- a/cms/app-client/app/styles/components/sorting-component.scss	Tue Dec 20 23:42:48 2016 +0100
+++ b/cms/app-client/app/styles/components/sorting-component.scss	Wed Dec 21 15:23:00 2016 +0100
@@ -1,5 +1,5 @@
 .sorting-component {
-    overflow: auto;
+    overflow: hidden;
     position: relative;
     height: 100%;
 }
@@ -29,19 +29,15 @@
     color: $corpus-grey;
 }
 
-.sorting-component div.tags ul {
+.sorting-component div.tags {
     text-align: center;
     position: absolute;
     overflow-y: scroll;
-    margin: 14px 0px;
+    margin: 30px 0px;
     top: 40px;
     bottom: 0px;
 }
 
-.sorting-component div.tags.hasMore ul {
-    position: static;
-}
-
 .sorting-component ul li {
     font-size: 13px;
 }
corpus_parole