Merge pull request #105 from JocelynDelalande/jd-sidebar-removal

Supprime la barre latérale
libreosteo · Mar 2, 2018 · 523b3fe · 523b3fe
2 parents 6f5d7e7 + 9c49b88
commit 523b3fe
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 356 deletions.
diff --git a/libreosteoweb/static/css/libreosteo.css b/libreosteoweb/static/css/libreosteo.css
@@ -15,6 +15,10 @@
     You should have received a copy of the GNU General Public License
     along with Libreosteo.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+/* For fixed navbar */
+body { padding-top: 50px; }
+
 .editable-click {
     !important;
     color : black;
@@ -165,9 +169,6 @@ div.readyForEditMode {
   min-height:34px;
 }
 
-.version {
-    font-size : 0.5em;
-}
 .editor {
     width: 250px;
     top:0px;

diff --git a/libreosteoweb/static/css/sb-admin-2.css b/libreosteoweb/static/css/sb-admin-2.css
@@ -21,7 +21,6 @@ body {
 @media(min-width:768px) {
     #page-wrapper {
         position: inherit;
-        margin: 0 0 0 250px;
         padding: 0 30px;
         border-left: 1px solid #e7e7e7;
     }

diff --git a/libreosteoweb/static/js/sb-admin-2.js b/libreosteoweb/static/js/sb-admin-2.js
@@ -26,10 +26,3 @@ $(function() {
         }
     })
 });
-
-
-$('#editorcommand').affix({
-    offset: {
-        top: $('#editorcommand').offset().top
-    }
-});
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
@@ -4,11 +4,9 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-24 22:29+0100\n"
 "PO-Revision-Date: 2016-10-20 13:59+0200\n"
-"Last-Translator: GURY <[email protected]>\n"
-"Language-Team: France <[email protected]>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n" 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -415,6 +413,30 @@ msgstr "Import/export"
 msgid "Rebuild index"
 msgstr "Réindexer"
 
+msgid "Help"
+msgstr "Aide"
+
+msgid "Project web page"
+msgstr "Site vitrine"
+
+msgid "Community support (forum)"
+msgstr "Support communautaire (forum)"
+
+msgid "Version"
+msgstr "Version"
+
+msgid "Edit"
+msgstr "Éditer"
+
+msgid "End of editing"
+msgstr "Fin d'édition"
+
+msgid "Import/export"
+msgstr "Import/export"
+
+msgid "Rebuild index"
+msgstr "Réindexer"
+
 msgid "Edit"
 msgstr "Éditer"
 
@@ -830,12 +852,3 @@ msgstr "Profil utilisateur"
 
 msgid "Profile was updated"
 msgstr "Profil mis à jour"
-
-#~ msgid "New Examination"
-#~ msgstr "Nouvelle consultation"
-
-#~ msgid "Export"
-#~ msgstr "Exporter"
-
-#~ msgid "Version"
-#~ msgstr "Version"