# HG changeset patch # User salimr # Date 1535997734 -7200 # Node ID a28361bda28cca20aa3d56d43300230ce37af359 # Parent de8d18c8251db9f67befd08715083c06b8fdffb3 Adapt all css classes with Bootstrap 4 Utilities diff -r de8d18c8251d -r a28361bda28c client/src/App.js --- a/client/src/App.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/App.js Mon Sep 03 20:02:14 2018 +0200 @@ -9,11 +9,11 @@ return (
-
+
-
-
Bienvenue sur
IRI Notes
-
+
+
Bienvenue sur
+

IRI Notes

diff -r de8d18c8251d -r a28361bda28c client/src/App.scss --- a/client/src/App.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/App.scss Mon Sep 03 20:02:14 2018 +0200 @@ -194,27 +194,5 @@ text-decoration-style: dotted; } -.editor-fixed { - border-top: 1px solid #efefef; - background-color: #fff; - padding: 20px 0; -} - -.panel-login, -.panel-register { - margin-top: 60px; -} - -#home-text{ - color:black; - font-size: 70px; - font-weight: bolder; - background-color:white; - border-color:white; -} - -#welcome { - font-size: 25px; - font-weight: bolder; } diff -r de8d18c8251d -r a28361bda28c client/src/components/CreateGroup.js --- a/client/src/components/CreateGroup.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/CreateGroup.js Mon Sep 03 20:02:14 2018 +0200 @@ -5,6 +5,7 @@ import Navbar from './Navbar'; import * as authActions from '../actions/authActions'; import { getOnline, getCreateGroup } from '../selectors/authSelectors'; +import './CreateGroup.css'; class CreateGroup extends Component { @@ -67,7 +68,7 @@ render() { - const errorMessages = this.props.createGroup.getIn(['errorMessages', 'data']); + // const errorMessages = this.props.createGroup.getIn(['errorMessages', 'data']); const okDisabled = (!this.state.name || this.state.name.trim() === ""); return ( @@ -75,25 +76,25 @@
-
-
-
-

Créer un groupe

-
-
- - - { this.renderErrorMessage(errorMessages, 'name') } +
+
+
+
Nouveau groupe
+ +
+ + + {/* { this.renderErrorMessage(errorMessages, 'name') } */}
-
- - - { this.renderErrorMessage(errorMessages, 'description') } +
+ + + {/* { this.renderErrorMessage(errorMessages, 'description') } */}
- { this.renderNonFieldErrors(errorMessages) } -
-
-
+ {/* { this.renderNonFieldErrors(errorMessages) } */} +
+ +
diff -r de8d18c8251d -r a28361bda28c client/src/components/CreateGroup.scss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/CreateGroup.scss Mon Sep 03 20:02:14 2018 +0200 @@ -0,0 +1,7 @@ +div.card-header.bg-primary.w-50 { + border-radius: 0% 0% 3% 3%; +} + +#session-button:hover{ + font-weight: bolder; +} diff -r de8d18c8251d -r a28361bda28c client/src/components/CreateSession.js --- a/client/src/components/CreateSession.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/CreateSession.js Mon Sep 03 20:02:14 2018 +0200 @@ -140,24 +140,23 @@ return (
- {/* */} - Créer une nouvelle session + Créer une nouvelle session -
-
+
+
{ e.preventDefault() } }> -
- +
+ {/*

{this.props.currentSession.group}

*/}
- - Titre +
- - Description +
- +
{/*
{JSON.stringify(this.props.currentSession.protocol, null, 2)}
*/}
{JSON.stringify(this.getGroupProtocol(), null, 2)}
- +
diff -r de8d18c8251d -r a28361bda28c client/src/components/CreateSession.scss --- a/client/src/components/CreateSession.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/CreateSession.scss Mon Sep 03 20:02:14 2018 +0200 @@ -4,23 +4,10 @@ #session-button { font-size: 22px; - font-weight: bold; cursor: pointer; } -label.col-form-label.text-secondary { - font-size: 16px; - margin-left: 20%; - font-weight: bolder; -} - .material-icons.protocol-toggle { font-size: 1rem; cursor: pointer; } - -#create-button{ - font-weight: bold; - margin: 5%; - -} diff -r de8d18c8251d -r a28361bda28c client/src/components/Login.js --- a/client/src/components/Login.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/Login.js Mon Sep 03 20:02:14 2018 +0200 @@ -72,21 +72,23 @@
-
-

IRI Notes

-
-
- +
+

IRI Notes

+ +
+ {/* { this.renderErrorMessage(errorMessages, 'username') } */}
-
- +
+ {/* { this.renderErrorMessage(errorMessages, 'password') } */}
{/* { this.renderNonFieldErrors(errorMessages) } */} - +
+ +
diff -r de8d18c8251d -r a28361bda28c client/src/components/Login.scss --- a/client/src/components/Login.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/Login.scss Mon Sep 03 20:02:14 2018 +0200 @@ -1,28 +1,8 @@ -h4.text-center { - font-size: 50px; - font-weight: bolder; -} - label.col-form-label.text-primary { font-size: 16px; - margin-left: 20%; - font-weight: bolder; -} - -.form-control { - width: 60%; - margin-left: 20%; -} - -form { - padding-top: 10%; } button.btn.btn-primary { font-size: 18px; - font-weight: bold; - padding: 15px 15px; - width: 30%; - margin-left: 35%; - margin-top: 7%; + } diff -r de8d18c8251d -r a28361bda28c client/src/components/Navbar.js --- a/client/src/components/Navbar.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/Navbar.js Mon Sep 03 20:02:14 2018 +0200 @@ -137,7 +137,7 @@ - ); } } diff -r de8d18c8251d -r a28361bda28c client/src/components/Navbar.scss --- a/client/src/components/Navbar.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/Navbar.scss Mon Sep 03 20:02:14 2018 +0200 @@ -6,23 +6,12 @@ color: white; } -#brand { - margin-top: 5px; -} - .username#navbarDropdown { font-size: 24px; - font-weight: medium; - margin-top:2%; } .nav-link { font-size: 20px; - margin-top: 8px; -} - -#sync-button { - margin-top: 7px; } .dropdown-toggle{ @@ -31,7 +20,6 @@ .dropdown-item { font-size: 18px; - font-weight: bold; cursor: pointer; } @@ -42,34 +30,14 @@ } .create-group { - width: 60%; - padding-top: 1.5%; - margin-top: 2.5%; - margin-bottom: 5%; - margin-left: 20%; font-size: 14px; } -.nav-link .user-dropdown { +.nav-link .dropdown-toggle .username .font-weight-bold { font-size: 18px; - font-weight: bold; - -} - -.ReactModal__Overlay { - margin-top: 5%; -} - -.modal-footer .btn { - margin-top: 40px; - padding: 16px; - font-weight: bold; } #logout-modal{ - padding-top: 2%; - margin-top: 20%; - -webkit-animation: fadein 0.5s; /* Safari, Chrome and Opera > 12.1 */ -moz-animation: fadein 0.5s; /* Firefox < 16 */ -ms-animation: fadein 0.5s; /* Internet Explorer */ @@ -107,11 +75,10 @@ } #logout-close-modal-button{ - margin-top: -2.5%; - margin-left: 92%; background-color: transparent; border: transparent; color: rgba(#769FED, .4); + cursor: pointer; } #logout-close-modal-button:hover{ @@ -120,24 +87,11 @@ color:black; } -.modal-text{ - margin-top: 10%; - font-size: 16px; - font-weight: 500; -} - .modal-warning{ color:#F95B5B; font-size:60px; - padding:0; - margin-top: 5%; - margin-right: 3%; } #logout-modal-button { - padding: 1.5%; - margin-top: 5%; - margin-right: 40%; - width: 20%; font-size: 14px; } diff -r de8d18c8251d -r a28361bda28c client/src/components/NavbarGroup.js --- a/client/src/components/NavbarGroup.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/NavbarGroup.js Mon Sep 03 20:02:14 2018 +0200 @@ -48,11 +48,11 @@ { currentGroupName }   -
+
{ groups && groups.map((group, key) => { const groupName = group.get('name'); const className = (groupName === currentGroupName)?'active':null; - return { groupName } + return { groupName } }) } diff -r de8d18c8251d -r a28361bda28c client/src/components/NavbarLogin.js --- a/client/src/components/NavbarLogin.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/NavbarLogin.js Mon Sep 03 20:02:14 2018 +0200 @@ -49,13 +49,13 @@ return (
  • - + { currentUser.get('username') }  
  • ); diff -r de8d18c8251d -r a28361bda28c client/src/components/NoteList.scss --- a/client/src/components/NoteList.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/NoteList.scss Mon Sep 03 20:02:14 2018 +0200 @@ -1,7 +1,4 @@ #delete-note-modal{ - padding-top: 2%; - margin-top: 30%; - -webkit-animation: fadein 0.5s; /* Safari, Chrome and Opera > 12.1 */ -moz-animation: fadein 0.5s; /* Firefox < 16 */ -ms-animation: fadein 0.5s; /* Internet Explorer */ @@ -39,11 +36,10 @@ } #delete-note-close-modal-button{ - margin-top: -2.5%; - margin-left: 92%; background-color: transparent; border: transparent; color: rgba(#769FED, .4); + cursor: pointer; } #delete-note-close-modal-button:hover { @@ -53,19 +49,9 @@ } .modal-text{ - margin-top: 10%; font-size: 16px; - font-weight: 500; } #delete-note-modal-button { - padding: 1.5%; - margin-top: 5%; - margin-right: 40%; - width: 20%; font-size: 14px; } - -.modal-footer{ - border: white; -} diff -r de8d18c8251d -r a28361bda28c client/src/components/NotesList.js --- a/client/src/components/NotesList.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/NotesList.js Mon Sep 03 20:02:14 2018 +0200 @@ -88,20 +88,19 @@ )} -
    - +
    + close +
    Êtes-vous sûr(e) de vouloir supprimer cette note ? -
    - +
    -
    ); } diff -r de8d18c8251d -r a28361bda28c client/src/components/Register.js --- a/client/src/components/Register.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/Register.js Mon Sep 03 20:02:14 2018 +0200 @@ -47,30 +47,32 @@
    -
    -

    IRI Notes

    -
    -
    - +
    +

    IRI Notes

    + +
    + { this.username = ref; }}*/ /> {/* { this.renderErrorMessage(errorMessages, 'username') } */}
    -
    - +
    + { this.email = ref; }}*/ /> {/* { this.renderErrorMessage(errorMessages, 'email') } */}
    -
    - +
    + { this.password1 = ref; }}*/ /> {/* { this.renderErrorMessage(errorMessages, 'password1') } */}
    -
    - +
    + { this.password2 = ref; }}*/ /> {/* { this.renderErrorMessage(errorMessages, 'password2') } */}
    - +
    + +
    diff -r de8d18c8251d -r a28361bda28c client/src/components/Register.scss --- a/client/src/components/Register.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/Register.scss Mon Sep 03 20:02:14 2018 +0200 @@ -1,29 +1,8 @@ -h4.text-center { - font-size: 50px; - font-weight: bolder; -} - label.col-form-label.text-primary { font-size: 16px; - margin-left: 20%; - font-weight: bolder; -} - -.form-control { - width: 60%; - margin-left: 20%; -} - -form { - padding-top: 10%; } button.btn.btn-primary { font-size: 18px; - font-weight: bold; - padding: 15px 15px; - width: 30%; - margin-left: 35%; - margin-top: 7%; } diff -r de8d18c8251d -r a28361bda28c client/src/components/SessionList.js --- a/client/src/components/SessionList.js Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/SessionList.js Mon Sep 03 20:02:14 2018 +0200 @@ -13,17 +13,11 @@ class SessionList extends Component { - constructor(props) { - super(props); - this.state = { + state = { show: false, modalIsOpen: false, sessionToDelete: null, } - this.doSomething = this.doSomething.bind(this); - this.toggleShow = this.toggleShow.bind(this); - this.hide = this.hide.bind(this); - } componentWillMount() { Modal.setAppElement('body'); @@ -34,17 +28,6 @@ console.log(e.target.innerHTML); } - toggleShow(){ - this.setState({show: !this.state.show}); - } - - hide(e){ - if(e && e.relatedTarget){ - e.relatedTarget.click(); - } - this.setState({show: false}); - } - openModal = () => { this.setState({modalIsOpen: true}); } @@ -107,45 +90,36 @@ return (
    -
    - + {/* */}
    -
    +
    {this.props.sessions.map((session) => - -
    - +
    + close +
    Êtes-vous sûr(e) de vouloir supprimer cette session ? -
    - +
    diff -r de8d18c8251d -r a28361bda28c client/src/components/SessionList.scss --- a/client/src/components/SessionList.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/SessionList.scss Mon Sep 03 20:02:14 2018 +0200 @@ -1,34 +1,56 @@ -.top-fade { - width: max-content; - height: 80px; -} - a.sessions{ cursor: pointer; } -.session { - padding-top: 5%; - padding-bottom: 1%; - padding-left: 5%; +#delete { + // opacity: 0; + // display: none; + -webkit-transition: .5s all; + -webkit-transition-delay: 5s; + -moz-transition: .5s all; + -moz-transition-delay: 5s; + -ms-transition: .5s all; + -ms-transition-delay: 5s; + -o-transition: .5s all; + -o-transition-delay: 5s; + transition: .5s all; + transition-delay: 5s; } +#delete:hover { + // opacity: 1; + display: inline-block; + -webkit-transition-delay: 0s; + -moz-transition-delay: 0s; + -ms-transition-delay: 0s; + -o-transition-delay: 0s; + transition-delay: 0s; +} + +.sessions:hover ~ #delete { + // opacity: 1; + display: inline-block; + -webkit-transition-delay: 0s; + -moz-transition-delay: 0s; + -ms-transition-delay: 0s; + -o-transition-delay: 0s; + transition-delay: 0s; +} + +.sessions:hover { + opacity: .7; +} + + span.session-title { font-size: 20px; - font-weight: 600; } span.session-description { font-size: 12px; - font-weight: 500 } span.session-date { font-size: 13px; - font-weight: 700; -} - -#toggle-edit { - padding-top:-20%; } .edit{ @@ -40,9 +62,6 @@ } #delete-session-modal{ - padding-top: 2%; - margin-top: 30%; - -webkit-animation: fadein 0.5s; /* Safari, Chrome and Opera > 12.1 */ -moz-animation: fadein 0.5s; /* Firefox < 16 */ -ms-animation: fadein 0.5s; /* Internet Explorer */ @@ -80,11 +99,10 @@ } #delete-session-close-modal-button{ - margin-top: -2.5%; - margin-left: 92%; background-color: transparent; border: transparent; color: rgba(#769FED, .4); + cursor: pointer; } #delete-session-close-modal-button:hover{ @@ -94,15 +112,9 @@ } .modal-text{ - margin-top: 10%; font-size: 16px; - font-weight: 500; } #delete-session-modal-button { - padding: 1.5%; - margin-top: 5%; - margin-right: 40%; - width: 20%; font-size: 14px; } diff -r de8d18c8251d -r a28361bda28c client/src/components/Settings.scss --- a/client/src/components/Settings.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/components/Settings.scss Mon Sep 03 20:02:14 2018 +0200 @@ -1,23 +1,7 @@ label.col-form-label.text-primary { font-size: 16px; - margin-left: 20%; - font-weight: bolder; -} - -.form-control { - width: 60%; - margin-left: 20%; -} - -form { - padding-top: 10%; } button.btn.btn-primary { font-size: 18px; - font-weight: bold; - padding: 15px 15px; - width: 30%; - margin-left: 35%; - margin-top: 7%; } diff -r de8d18c8251d -r a28361bda28c client/src/scss/_custom.scss --- a/client/src/scss/_custom.scss Mon Sep 03 11:57:58 2018 +0200 +++ b/client/src/scss/_custom.scss Mon Sep 03 20:02:14 2018 +0200 @@ -12,6 +12,9 @@ $component-active-bg: theme-color("secondary"); +$h4-font-size: 3rem; +$h5-font-size: 1.5rem; + //Dropdowns $dropdown-padding-y: 1rem; $dropdown-link-color: theme-color("secondary"); @@ -20,7 +23,7 @@ -// Navs +//Navs $nav-link-padding-y: .2rem; $navbar-brand-font-size: 30px; $navbar-light-color: darken((theme-color("secondary")), 2%); @@ -31,5 +34,13 @@ //Modals $modal-content-border-width: .1rem; +//Forms +$input-btn-padding-y: .2rem; +$input-padding-y: .1rem; +$input-border-width: .1rem; +$input-placeholder-color: theme-color("secondary"); + +$form-group-margin-bottom: .2rem; + @import "bootstrap/scss/bootstrap";