Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r509cebe97fca335b7d517abc7e8d9af03d6eab2e -rb75c055c6e1fbc3f8522de9376363afb19539679
--- lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision 509cebe97fca335b7d517abc7e8d9af03d6eab2e)
+++ lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision b75c055c6e1fbc3f8522de9376363afb19539679)
@@ -180,8 +180,7 @@
-
+
Index: lams_central/web/css/addLesson.css
===================================================================
diff -u -r03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867 -rb75c055c6e1fbc3f8522de9376363afb19539679
--- lams_central/web/css/addLesson.css (.../addLesson.css) (revision 03b0e2bc93bc7cd09dca055ec8f00ff24ec8f867)
+++ lams_central/web/css/addLesson.css (.../addLesson.css) (revision b75c055c6e1fbc3f8522de9376363afb19539679)
@@ -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
===================================================================
diff -u -rd6a9692741232269667afafa3e0c7dc48ed3caa5 -rb75c055c6e1fbc3f8522de9376363afb19539679
--- lams_central/web/css/authoring.css (.../authoring.css) (revision d6a9692741232269667afafa3e0c7dc48ed3caa5)
+++ lams_central/web/css/authoring.css (.../authoring.css) (revision b75c055c6e1fbc3f8522de9376363afb19539679)
@@ -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
===================================================================
diff -u -rff4dd02ceeae0caf0ac1ce4bdf740bf69b018fee -rb75c055c6e1fbc3f8522de9376363afb19539679
--- lams_central/web/css/defaultHTML_learner.css (.../defaultHTML_learner.css) (revision ff4dd02ceeae0caf0ac1ce4bdf740bf69b018fee)
+++ lams_central/web/css/defaultHTML_learner.css (.../defaultHTML_learner.css) (revision b75c055c6e1fbc3f8522de9376363afb19539679)
@@ -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 {