Index: lams_central/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v diff -u -r1.16.2.9 -r1.16.2.10 --- lams_central/web/addLesson.jsp 27 Jun 2016 10:01:31 -0000 1.16.2.9 +++ lams_central/web/addLesson.jsp 25 Jul 2016 04:29:42 -0000 1.16.2.10 @@ -180,8 +180,7 @@
- + Index: lams_central/web/css/addLesson.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/addLesson.css,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_central/web/css/addLesson.css 5 Feb 2016 09:53:04 -0000 1.3.2.2 +++ lams_central/web/css/addLesson.css 25 Jul 2016 04:27:27 -0000 1.3.2.3 @@ -1,3 +1,5 @@ +@import url('/lams/css/inlineeditor.css'); + #loadingOverlay { width: 100%; height: 99%; @@ -201,7 +203,7 @@ } div#introDescriptionDiv { - padding: 0px 10px 0px 30px; + padding: 0px 30px 0px 15px; } div#introDescriptionLabelDiv { Index: lams_central/web/css/authoring.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v diff -u -r1.30.2.7 -r1.30.2.8 --- lams_central/web/css/authoring.css 4 Jul 2016 05:27:54 -0000 1.30.2.7 +++ lams_central/web/css/authoring.css 25 Jul 2016 04:27:27 -0000 1.30.2.8 @@ -1,3 +1,5 @@ +@import url('/lams/css/inlineeditor.css'); + /**** Global styles ****/ .ygtv-highlight1, .ygtv-highlight1 .ygtvlabel { @@ -437,36 +439,3 @@ vertical-align: top; } -/** CKEditor Inline */ -.cke_textarea_inline { - /* From bootstrap form-control */ - display: block; - padding: 6px 12px; - color: #555; - background-color: #fff; - background-image: none; - border: 1px solid #ccc; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; - -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; - transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; border: 1px solid #c1c1c1; - /* LAMS */ - width: 90%; - min-height: 100px; - -webkit-appearance: textfield; -} - -.cke_textarea_inline:focus{ - /* From bootstrap form-control */ - border-color: #66afe9; - outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); -} - -.cke_reset_all { - width: 70% !important; -} - Index: lams_central/web/css/defaultHTML_learner.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_learner.css,v diff -u -r1.32.2.22 -r1.32.2.23 --- lams_central/web/css/defaultHTML_learner.css 4 Jul 2016 06:26:26 -0000 1.32.2.22 +++ lams_central/web/css/defaultHTML_learner.css 25 Jul 2016 04:29:16 -0000 1.32.2.23 @@ -7,6 +7,7 @@ /* Imports */ @import url('/lams/includes/font-awesome/css/font-awesome.min.css'); @import url('/lams/css/bootstrap.min.css'); +@import url('/lams/css/inlineeditor.css'); @media (max-width: 500px) { .h1, .h2, @@ -273,41 +274,7 @@ cursor: pointer; } -/** CKEditor Inline */ -.cke_textarea_inline { - /* From bootstrap form-control */ - display: block; - width: 100%; - padding: 6px 12px; - font-size: 14px; - line-height: 1.42857143; - color: #555; - background-color: #fff; - background-image: none; - border: 1px solid #ccc; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075); - -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s; - -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; - transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; border: 1px solid #c1c1c1; - /* LAMS */ - min-height: 100px; - -webkit-appearance: textfield; -} -.cke_textarea_inline:focus{ - /* From bootstrap form-control */ - border-color: #66afe9; - outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); -} - -.cke_reset_all { - width: 70% !important; -} - /** Authoring */ /*layout of adding a topic button */ a.button-add-item:before {