Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Supprime la barre latérale #105

Merged
merged 9 commits into from
Mar 2, 2018
Merged

Supprime la barre latérale #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bbc129e
Cleanup commented code
JocelynDelalande Feb 21, 2018
ca5ef10
Move sidebar stuff to top bar
JocelynDelalande Feb 21, 2018
cb886a0
Fix the navbar to the top
JocelynDelalande Feb 21, 2018
8c01cab
Remove sidebar
JocelynDelalande Feb 21, 2018
f1b016b
Fix old makemessages strings locations
JocelynDelalande Feb 21, 2018
46e0f79
Add an "Help" menu to the navbar
JocelynDelalande Feb 21, 2018
309a5e4
Move version information to the help menu
JocelynDelalande Feb 21, 2018
549e629
Fix pointer on help top menu
JocelynDelalande Feb 28, 2018
9c49b88
Merge branch 'develop' into jd-sidebar-removal
jbgury Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions libreosteoweb/static/css/libreosteo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -165,9 +169,6 @@ div.readyForEditMode {
min-height:34px;
}

.version {
font-size : 0.5em;
}
.editor {
width: 250px;
top:0px;
Expand Down
1 change: 0 additions & 1 deletion libreosteoweb/static/css/sb-admin-2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
7 changes: 0 additions & 7 deletions libreosteoweb/static/js/sb-admin-2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,3 @@ $(function() {
}
})
});


$('#editorcommand').affix({
offset: {
top: $('#editorcommand').offset().top
}
});
Binary file modified locale/fr/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
37 changes: 25 additions & 12 deletions locale/fr/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Loading