Commit a739451d authored by Hermann Mayer's avatar Hermann Mayer
Browse files

Replaced Bootstrap-Modal with a advanced Fork. (Resposive features added)... 

Replaced Bootstrap-Modal with a advanced Fork. (Resposive features added) Added some style hotfixes. (See i22/i23)
parent 4cc9d4ac

app/Resources/views/base.html.twig

+2 −2
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ 


    <script>theme = {current: "{{ theme }}"};</script>



    {% stylesheets '@JityHomepageBundle/Resources/public/css/theme/10_jity_dark.css' filter='?yui_css' %}

    {% stylesheets '@JityHomepageBundle/Resources/public/css/theme/10_jity-dark.css' filter='?yui_css' %}

      {% if theme == 'dark' %}

          <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />

      {% endif %}

      <script>theme.dark = "{{ asset_url }}";</script>

    {% endstylesheets %}



    {% stylesheets '@JityHomepageBundle/Resources/public/css/theme/10_jity_bright.css' filter='?yui_css' %}

    {% stylesheets '@JityHomepageBundle/Resources/public/css/theme/10_jity-bright.css' filter='?yui_css' %}

      {% if theme == 'bright' %}

          <link rel="stylesheet" type="text/css" href="{{ asset_url }}" />

      {% endif %}

src/Jity/HomepageBundle/Controller/EditorController.php

+3 −1
Original line number Diff line number Diff line
@@ -69,10 +69,11 @@ class EditorController extends Controller 
     * @param mixed $label 

     * @param mixed $body 

     * @param mixed $enableJS 

     * @param mixed $class 

     * @access public

     * @return void

     */

    public function modalAction($name, $buttons = array(), $label = null, $body = null, $enableJS = false)

    public function modalAction($name, $buttons = array(), $label = null, $body = null, $enableJS = false, $class = null)

    {

        $reqBtn = array(

            'id'    => '',
@@ -94,6 +95,7 @@ class EditorController extends Controller 
            'buttons'  => $validBtns,

            'label'    => $label,

            'body'     => $body,

            'class'    => $class

        ));

    }

src/Jity/HomepageBundle/Resources/public/css/02_bootstrap-modal.css

0 → 100644
+185 −0
Original line number Diff line number Diff line 
/* MODALS */



.modal-open.has-modal-container {

	position: relative; /* safari */

	overflow: hidden;

}





/* add a scroll bar to stop page from jerking around */

.modal-open.page-overflow .page-container,

.modal-open.page-overflow .page-container .navbar-fixed-top,

.modal-open.page-overflow .page-container .navbar-fixed-bottom,

.modal-open.page-overflow .modal-container  {

	overflow-y: scroll;

}



.modal-container {

	display: none;

	position: fixed;

	top: 0;

	bottom: 0;

	left: 0;

	right: 0;

	overflow: auto;

	z-index: 9999;

}



.modal-open > .modal-container {

	display: block;

}



.modal {

	outline: none;

	position: absolute;

	margin-top: 0;

	top: 50%;

	overflow: visible; /* allow content to popup out (i.e tooltips) */

}



.modal.fade {

	top: -100%;

	-webkit-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;	

	   -moz-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;

	     -o-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;

	        transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;

}



.modal.fade.in {

	top: 50%;

}



.modal-body {

	max-height: none;

	overflow: visible;

}



.modal.modal-absolute {

	position: absolute;

	z-index: 950;

}



.modal .loading-mask {

	position: absolute;

	top: 0;

	bottom: 0;

	left: 0;

	right: 0;

	background: #fff;

	border-radius: 6px;

}



.modal-spinner {

	position: absolute;

	top: 50%;

	left: 50%;

}



.modal-backdrop.modal-absolute{

	position: absolute;

	z-index: 940;

}



.modal-backdrop, 

.modal-backdrop.fade.in{

	opacity: 0.7;

	filter: alpha(opacity=70);

	background: #fff;

}



.modal.container {

  width: 940px;

  margin-left: -470px;

}



/* Modal Overflow */



.modal-overflow.modal {

	top: 1%;

	/*bottom: 1%;*/

}



.modal-overflow.modal.fade {

	top: -100%;

}



.modal-overflow.modal.fade.in {

	top: 1%;

	/*bottom: 1%;*/

}



.modal-overflow .modal-body {

	overflow: auto;

	-webkit-overflow-scrolling: touch;

}



/*.modal-overflow .modal-body {

	position: absolute;

	top: 0;

	bottom: 0;

	right: 0;

	left: 0;

	margin-top: 48px; // header height

	margin-bottom: 60px; // footer height

	overflow: auto;

}





.modal-overflow .modal-footer {

	position: absolute;

	bottom: 0;

	right: 0;

	left: 0;

}*/



/* Responsive */



@media (min-width: 1200px) {

	.modal.container {

		width: 1170px;

		margin-left: -585px;

	}

}



@media (max-width: 979px) {

	.modal, 

	.modal.container,

	.modal.modal-overflow 	{

		top: 1%;

		right: 1%;

		left: 1%;

		bottom: auto;

		width: auto !important;

		height: auto !important;

		margin: 0 !important;

		padding: 0 !important;

	}

	

	.modal.fade.in, 

	.modal.container.fade.in,

	.modal.modal-overflow.fade.in {

		top: 1%;

		bottom: auto;

	}

	

	.modal-body,

	.modal-overflow .modal-body {

		position: static;

		margin: 0;

		height: auto !important;

		max-height: none !important;

		overflow: visible !important;

	}

	

	.modal-footer,

	.modal-overflow .modal-footer {

		position: static;

	}

}



.loading-spinner {

	position: absolute;

	top: 50%;

	left: 50%;

	margin: -12px 0 0 -12px;

}

src/Jity/HomepageBundle/Resources/public/css/90_jity_structure.css→src/Jity/HomepageBundle/Resources/public/css/90_jity-structure.css

+44 −7
Original line number Diff line number Diff line
@@ -146,18 +146,40 @@ p { 
    font-size: 14px;

}



#editor { 

.modal-backdrop, .modal-backdrop.fade.in {

    background: none repeat scroll 0 0 #000000;

}



.modal-header {

    border-radius: 6px 6px 0 0;

}



.editor-container {

    position: relative;

    width: 910px;

    height: 400px;

    min-width: 100%;

    min-height: 100%;

}



#editor_modal {

   width: 940px;

   margin-left: -470px;

   margin-top: -350px;

#editor {

    position: absolute;

    top: 0;

    bottom: 0;

    left: 0;

    right: 0;

}



/* #editor {  */

/*     position: relative; */

/*     width: 910px; */

/*     height: 400px; */

/* } */



/* #editor_modal { */

/*    width: 940px; */

/*    margin-left: -470px; */

/*    margin-top: -350px; */

/* } */



input::-moz-focus-inner, button::-moz-focus-inner {

  border: 0;

}
@@ -545,3 +567,18 @@ code, pre { 
    cursor: pointer;

}



.collection {

    min-height: 50px;

    border-radius: 6px;

    padding: 0 20px 0 20px;

    box-shadow: inset 2px 2px 5px rgba(0, 0, 0, 0.35), 7px 7px 15px rgba(0, 0, 0, 0.15);

    border-style: solid;

    border-width: 1px;

    margin-top: 10px;

    margin-bottom: 10px;

}



.ui-state-highlight {

    margin: 15px 0 15px 0;

}