diff options
| author | jpl | 2017-04-18 15:58:37 +0200 |
|---|---|---|
| committer | jpl | 2017-04-18 15:58:37 +0200 |
| commit | 6f74bcd9f611adf684624191964f53c17f3b03b0 (patch) | |
| tree | d874924c2e2fe981f6af3b047e792578f32316bc | |
| parent | 2060a3d88b5320b4ab88821fa8c0f896501e6dd2 (diff) | |
| download | chouette-core-6f74bcd9f611adf684624191964f53c17f3b03b0.tar.bz2 | |
Refs #2982: updating layout for tt#edit
4 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js index ea47f56d3..63e6387ea 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js @@ -7,7 +7,7 @@ const Metas = ({metas, onUpdateDayTypes, onUpdateComment, onUpdateColor, onSelec let colorList = ["", "#9B9B9B", "#FFA070", "#C67300", "#7F551B", "#41CCE3", "#09B09C", "#3655D7", "#6321A0", "#E796C6", "#DD2DAA"] return ( <div className="row"> - <div className="col-lg-8 col-lg-offset-2 col-md-8 col-md-offset-2 col-sm-10 col-sm-offset-1"> + <div className="col-lg-6 col-lg-offset-3 col-md-8 col-md-offset-2 col-sm-10 col-sm-offset-1"> <div className='form-horizontal'> <div className="row"> <div className="col-lg-12"> diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js b/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js index 9b41016a0..b30e2dae8 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/Timetable.js @@ -12,7 +12,7 @@ class Timetable extends Component{ render() { return ( <div className='row'> - <div className="col-lg-12"> + <div className="col-lg-8 col-lg-offset-2 col-md-8 col-md-offset-2 col-sm-10 col-sm-offset-1"> <div className="table table-2entries mt-sm mb-sm"> <div className="t2e-head w20"> <div className="th"> diff --git a/app/assets/stylesheets/components/_forms.sass b/app/assets/stylesheets/components/_forms.sass index 6d841d5d4..8419c2345 100644 --- a/app/assets/stylesheets/components/_forms.sass +++ b/app/assets/stylesheets/components/_forms.sass @@ -706,6 +706,9 @@ $grp-cbx-size: 34px display: inline-block margin: 0 5px + &:first-child + margin-left: 0 + > .checkbox display: block width: $grp-cbx-size diff --git a/app/assets/stylesheets/modules/_timetables.sass b/app/assets/stylesheets/modules/_timetables.sass index 7b44c854a..8d0663621 100644 --- a/app/assets/stylesheets/modules/_timetables.sass +++ b/app/assets/stylesheets/modules/_timetables.sass @@ -4,15 +4,21 @@ #periods .t2e-head > .th - height: 134px + height: 135px + text-align: left + border-color: $darkgrey + border-top-width: 2px > .strong - padding-top: 122px + padding-top: 123px transform: translateY(-1.4em) .t2e-item .th padding: 6px 0 0 0 + border-color: $darkgrey + border-top-width: 2px + > .monthName padding: 0 0 6px 8px |
