This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI-2017 in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 24b67ca673cbfc1b1a53c8ad12065ba0c0537a15 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Dec 19 17:36:43 2017 +0100 Refonte de l'UI: Nettoyage dans les fichiers less et réorganisation --- bow-ui/src/main/less/base/_all.less | 4 - bow-ui/src/main/less/base/_header.less | 80 ----- bow-ui/src/main/less/bow.less | 19 +- bow-ui/src/main/less/common/_all.less | 10 - bow-ui/src/main/less/common/_dropdown.less | 19 -- bow-ui/src/main/less/common/_tags.less | 8 - bow-ui/src/main/less/components/bookmark.less | 418 -------------------------- bow-ui/src/main/less/variables/_all.less | 3 - 8 files changed, 16 insertions(+), 545 deletions(-) diff --git a/bow-ui/src/main/less/base/_all.less b/bow-ui/src/main/less/base/_all.less deleted file mode 100644 index fdb1d2e..0000000 --- a/bow-ui/src/main/less/base/_all.less +++ /dev/null @@ -1,4 +0,0 @@ -// Import de tous les fichiers LESS du dossier -@import "_footer"; -@import "_header"; -@import "_layout"; diff --git a/bow-ui/src/main/less/base/_header.less b/bow-ui/src/main/less/base/_header.less deleted file mode 100644 index f91e087..0000000 --- a/bow-ui/src/main/less/base/_header.less +++ /dev/null @@ -1,80 +0,0 @@ -#header{ - background:#fff; - height:@default-header-height; - width:100%; - border-bottom: 1px solid @color-separation-border; -} -.header-logo { - height: @default-header-height - 2 * @default-marge--small; - - float: left; - - margin-left: @default-marge--large; - margin-top: @default-marge--small; - margin-right: @default-marge--medium; - - display: block; - - img { - height: 100%; - } -} - -#header-user-infos { - float: right; - - padding-right: @default-marge--large; - padding-left: @default-marge--small; - - background-color: @color-background-user-infos; - height: @default-header-height; - - .logout { - display: none; /* FIXME LK à virer */ - } -} - -.header-link { - height: @default-header-height; - line-height: @default-header-height; - - margin-right: @default-marge--small; - - display: inline-block; - vertical-align: middle; - - i { - line-height: inherit; - opacity: 0.5; - vertical-align: middle; - } -} - - -#header-search { - float: right; - - margin-right: @default-marge--small; - - border-bottom: 1px solid @color-separation-border; - - .header-search-label, - select, - input { - height: @default-header-height - 3 * @default-marge--small; - - margin-top: 1.5 * @default-marge--small; - - border: 0; - } - input { - width: 70px; - transition: width 1s 0s; - &:focus { - width: 200px; - } - } - form { - display: inline-block; - } -} \ No newline at end of file diff --git a/bow-ui/src/main/less/bow.less b/bow-ui/src/main/less/bow.less index a7e61e9..818c80e 100644 --- a/bow-ui/src/main/less/bow.less +++ b/bow-ui/src/main/less/bow.less @@ -9,6 +9,19 @@ // - vendors : CSS provenant des 3rd party // Le fichier _print.less est inclus en dernier pour surcharger les autres -@import "variables/_all"; -@import "base/_all"; -@import "common/_all"; +@import "variables/_colors"; +@import "variables/_globals"; + +@import "base/_footer"; +@import "base/_sidebar"; +@import "base/_layout"; + +@import "common/_bookmark"; +@import "common/_bookmark-list"; +@import "common/_bookmark-grid"; +@import "common/_button"; +@import "common/_form"; +@import "common/_icons"; +@import "common/_modal"; +@import "common/_notifications"; +@import "common/_tools"; diff --git a/bow-ui/src/main/less/common/_all.less b/bow-ui/src/main/less/common/_all.less deleted file mode 100644 index 66b9101..0000000 --- a/bow-ui/src/main/less/common/_all.less +++ /dev/null @@ -1,10 +0,0 @@ -// Import de tous les fichiers LESS du dossier -@import "_bookmark"; -@import "_bookmark-list"; -@import "_bookmark-grid"; -@import "_button"; -@import "_dropdown"; -@import "_form"; -@import "_icons"; -@import "_tags"; -@import "_tools"; diff --git a/bow-ui/src/main/less/common/_dropdown.less b/bow-ui/src/main/less/common/_dropdown.less deleted file mode 100644 index 43f741e..0000000 --- a/bow-ui/src/main/less/common/_dropdown.less +++ /dev/null @@ -1,19 +0,0 @@ -.dropdown-menu { - position: relative; - - ul { - display: none; - } - - &:hover { - - ul { - display: block; - position: absolute; - right: 0; - top: 100%; - background: #888; - z-index: 999; - } - } -} \ No newline at end of file diff --git a/bow-ui/src/main/less/common/_tags.less b/bow-ui/src/main/less/common/_tags.less deleted file mode 100644 index a524f4b..0000000 --- a/bow-ui/src/main/less/common/_tags.less +++ /dev/null @@ -1,8 +0,0 @@ -.cloud { - - -} - -.cloud-tag { - padding: 5px; -} \ No newline at end of file diff --git a/bow-ui/src/main/less/components/bookmark.less b/bow-ui/src/main/less/components/bookmark.less deleted file mode 100644 index 7b6acce..0000000 --- a/bow-ui/src/main/less/components/bookmark.less +++ /dev/null @@ -1,418 +0,0 @@ -#page{ - margin: 15px 0 50px 0; -} - - -#main{ - clear:both; -} - -.content{ - width:90%; - margin: 0 auto; -} - -#side { - clear:right; - float:right; - position:relative; - right:73%; - width:27%; - display: none; /* FIXME LK : side to remove*/ -} - -.bookmark{ - width:100%; - height:auto; - clear: both; - background-color: #f3f6f9; - margin: 10px 0; -} - -.spacemax { - width: 100%; -} - -.bookmark .favicon { - width: 32px; - height: 32px; - float:left; -} - - - -.bookmark .bookmarkhead .screenshotLink{ - width:31px; - height:32px; - background:url('../img/camera.png') no-repeat; -} - -.bookmark .bookmarkhead .edit{ - background:url('../img/edit.jpg') no-repeat; - width:31px; - height:32px; -} - -.bookmark .bookmarkhead .supprim{ - background:url('../img/croix.jpg') no-repeat; - width:31px; - height:32px; -} - -.bookmark .bookmarkhead a{ - color:#FFF; - font-weight:bold; - font-size:14px; - display:block; - text-decoration:none; -} - -.bookmark .bookmarkhead .alias{ -} - -.bookmark .screenshot{ - float:left; - margin:5px 10px; - width:100px; - height:75px; - /*background:url('../img/livreG.jpg') no-repeat;*/ -} - -.bookmark .description{ - margin:5px 5px; - color:#999999; - font-size:12px; - position: relative; - width: 100%; -} - - -.bookmark .description .tags{ - color:#88516c; - background:url('../img/tag.jpg') no-repeat left center; - font-size:12px; - padding-left:30px; - height:auto; - width:100%; - line-height:28px; - padding-top:10px; - margin-bottom:-70px; -} - -.bookmark .description .tags .tag{ - margin-right:5px; - text-decoration:none; -} - -.bookmark .click{ - float:right; - width:31px; - text-align:center; -} - -.nobookmarks{ - font-size: large; - padding-left: 5px; -} - -a.help{ - background:transparent url('../img/aide.jpg') no-repeat scroll 0 0; - display:block; - height:34px; - text-indent:-99999px; - width:34px; - float:left; -} - - -#side #colonneD{ - font-size:14px; - color:#9edcf8; -} - -#colonneD{ - overflow-x:auto; - background-color:#804561; - margin-top: -2px; -} - -#colonneD a{ - font-size:12px; - color:#9edcf8; -} - -#colonneD ul.droite{ - padding:5% 10%; - border-bottom: 0 solid #9edcf8; -} - -#colonneD ul.droite li{ - list-style:none; - height:auto; - font-size:100%; -} - -#colonneD ul.droite li a{ - font-size:14px; - font-weight:normal; - text-decoration:none; - color:#9edcf8; -} - -#colonneD ul.droite li a:hover{ - text-decoration:underline; -} - -#colonneD #extensions h2 { - margin: 4% 0 0 10%; -} - -#colonneD #extensions li { - padding-bottom: 10px; -} - -#colonneD #extensions .extensionIcon { - float:left; - border:0 none; - margin-right:10px; -} - -#colonneD #extensions .extensionName { - padding: 4px 0 0 30px; -} - -#colonneD #nuage, -#colonneD #import, -#colonneD #add{ - padding:4% 10%; - border-bottom: 0 solid #9edcf8; -} - -#colonneD h2{ - color:#9edcf8; - font-size:140%; - font-weight:normal; -} - -#colonneD #add{ - height:auto; -} - -#colonneD #add form{ - clear:both; -} - -#colonneD form .input{ - padding:10px 0; -} - -#colonneD form input{ - width:50%; - border:none; - height:28px; - padding-left:4px; -} - -#colonneD #add form label{ - display:inline-block; - padding-right:9%; - text-align:right; - width:45px; -} - -#colonneD form input[type="submit"]{ - background:transparent url('../img/fondbouton.jpg') repeat-x scroll 0 0; - border:medium none; - color:#9C7186; - display:block; - float:right; - font-size:12px; - font-weight:bold; - height:28px; - line-height:28px; - position:relative; - right:20%; - text-align:center; - text-decoration:none; - width:25%; -} - -#colonneD #nuage{ - padding-right:80px; - min-height:100px; - text-align:justify; -} - -.colonnebas img{ - width:86%; - height:auto; - display:block; - position:relative; -} - -#import .input input{ - width:90%; - margin-bottom:10px; -} - - - -.formFrame{ - float: left; /* pour que le contenu en float ne deborde pas du cadre */ - width: 90%; - min-width:400px; -/* min-height: 315px; */ - position:relative; - margin-top:20px; - margin-bottom:20px; - margin-right:100px; - margin-left:40px; - padding-top:10px; - padding-bottom:10px; - padding-left:40px; - padding-right:70px; -} - -.formFrame ul{ - padding-left:10px; -} - -.formFrame h1{ - color:#804561; - width:225px; - position:relative; - margin:20px auto; -} - -.formFrame p{ - color:#804561; - font-size:11px; - font-weight:bold; - padding:15px 0; -} - -.formFrame p input[type="text"], td input[type="text"], -.formFrame p input[type="password"], td input[type="password"]{ - width:225px; -} - -.formFrame input[type="submit"]{ - margin-top:20px; - background:url('../img/fdboutonV.jpg') repeat-x; - height:31px; - line-height:31px; - color:#FFFFFF; - font-weight:bold; - border:none; - width:auto; - padding:2px; -} - -.formFrame p a{ - position:absolute; - color:#804561; - left:75px; - font-weight:bold; - font-size:12px; - margin-top:2px; -} - -.formFrame #homePage, -.formFrame #regenPermToken{ - bottom:50px; - left:185px; - font-size:10px; -} - -.formFrame p input, td input{ - margin-bottom:2px; -} - -.deleteImport{ - width:100%; - height:32px; - border:1px solid black; - margin-bottom:4px; - padding-top:10px; - padding-left:15px; -} - -.deleteImportPink{ - background-color:#BF8A9C; -} - -.deleteImportWhite{ - background-color:white; - margin-left:30px; -} - -.deleteImport span{ - color:blue; - font-size:large; -} - -.deleteImport .deleteImportButton{ - background:url('../img/croixtr.png') no-repeat; - width:31px; - height:32px; - float:right; - margin-right:15px; - position:relative; - top:-5px; -} - -#deleteSearchResultsButton{ - background:url('../img/croixtr.png') no-repeat; - width:31px; - height:32px; - float:right; - margin-left:25px; - margin-right:11px; -} - -.input label{ - color:#804561; -/* - font-size:20px; - font-weight:normal; - font-style:normal; - float:left; - margin-bottom:20px; - width:100%; -*/ -} - -#bookmarkForm label{ - margin-top:12px; - font-style:normal; -} - -#add h2{ - margin-bottom:20px; -} - -#adminActions li{ - list-style-type:none; - padding-bottom:15px; -} - -#adminActions li a{ - text-decoration:none; - color:#804561; - font-size:11px; - font-weight:bold; -} - -#labelsForm .list input{ - float: left; - clear:left; -} - -#labelsForm .list label { - float: left; -} - -#labelsForm .action { - float: left; - clear:left; -} diff --git a/bow-ui/src/main/less/variables/_all.less b/bow-ui/src/main/less/variables/_all.less deleted file mode 100644 index 07a3a31..0000000 --- a/bow-ui/src/main/less/variables/_all.less +++ /dev/null @@ -1,3 +0,0 @@ -// Import de tous les fichiers LESS du dossier -@import "_colors"; -@import "_globals"; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.