Skip to content

Commit

Permalink
:wq
Browse files Browse the repository at this point in the history
  • Loading branch information
@joomlart
joomlart committed Nov 7, 2013
2 parents 6d749f7 + 8aabc85 commit bca20a7
Show file tree
Hide file tree
Showing 5 changed files with 244 additions and 54 deletions.
2 changes: 1 addition & 1 deletion source/plg_system_t3/base-bs3/html/mod_search/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<form class="form-search" action="<?php echo JRoute::_('index.php');?>" method="post">
<div class="search<?php echo $moduleclass_sfx ?>">
<?php
$output = '<label for="mod-search-searchword">'.$label.'</label><input name="searchword" id="mod-search-searchword" maxlength="'.$maxlength.'" class="input'.$moduleclass_sfx.'" type="text" size="'.$width.'" placeholder="'.$text.'" />';
$output = '<label for="mod-search-searchword">'.$label.'</label><input name="searchword" id="mod-search-searchword" maxlength="'.$maxlength.'" class="form-control'.$moduleclass_sfx.'" type="text" size="'.$width.'" placeholder="'.$text.'" />';

if ($button) :
if ($imagebutton) :
Expand Down
287 changes: 237 additions & 50 deletions source/tpl_t3_bs3_blank/less/form.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,55 +19,242 @@
// GENERIC STYLES
// ------------------------------------------------------

select,
textarea,
input[type="text"],
input[type="password"],
input[type="datetime"],
input[type="datetime-local"],
input[type="date"],
input[type="month"],
input[type="time"],
input[type="week"],
input[type="number"],
input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
input[type="color"],
.uneditable-input {
height: auto;
}


// Everything else
textarea,
input[type="text"],
input[type="password"],
input[type="datetime"],
input[type="datetime-local"],
input[type="date"],
input[type="month"],
input[type="time"],
input[type="week"],
input[type="number"],
input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
input[type="color"],
.uneditable-input {
.transition(~"border linear .2s, box-shadow linear .2s, width 0.7s ease 0s");
}


// INPUT GROUPS
// ------------

// Allow us to put symbols and text within the input field for a cleaner look
.input-append,
.input-prepend {
.add-on {
form {
}

fieldset {
}

legend {
// Small
small {
}
}

label {
}


// FORM CONTROLS
// ------------------------------------------------------
// select
// textarea
// input[type="text"]
// input[type="password"]
// input[type="datetime"]
// input[type="datetime-local"]
// input[type="date"]
// input[type="month"]
// input[type="time"]
// input[type="week"]
// input[type="number"]
// input[type="email"]
// input[type="url"]
// input[type="search"]
// input[type="tel"]
// input[type="color"]
.form-control {

// Hover state
&:hover {
}

// Focus state
&:focus,
&:active {
}

// Reset height for `textarea`s
textarea& {
height: auto;
}
}
}


// Form groups
// -----------------------
.form-group {
}


// Checkboxes and radios
// -----------------------
.radio,
.checkbox {
}


// Radios and checkboxes on same line
.radio-inline,
.checkbox-inline {
}


// Form control sizing
// -----------------------
.input-sm {
}

.input-lg {
}


// Help text
// -----------------------
.help-block {
}


// Inline forms
// -----------------------
.form-inline {

// Kick in the inline
@media (min-width: @screen-sm) {

.form-group {
}

.form-control {
}

}
}


// Horizontal forms
// -----------------------
.form-horizontal {

.form-group {
}

.form-control {
}

}



//
// BUTTONS
// ------------------------------------------------------

// Base styles
// -----------------------

// Core styles
.btn {

// Button states
&:hover,
&:focus {
}

&:active,
&.active {
}

&.disabled,
&[disabled],
fieldset[disabled] & {
}

}


// Alternate buttons
// -----------------------
.btn-default {
}

.btn-primary {
}

// Warning appears as orange
.btn-warning {
}

// Danger and error appear as red
.btn-danger {
}

// Success appears as green
.btn-success {
}

// Info appears as blue-green
.btn-info {
}


// Link buttons
// -----------------------
// Make a button look and behave like a link
.btn-link {

&,
&:active,
&[disabled],
fieldset[disabled] & {
}

&,
&:hover,
&:focus,
&:active {
}

&:hover,
&:focus {
}

&[disabled],
fieldset[disabled] & {
&:hover,
&:focus {
}
}

// End
}


// Button Sizes
// -----------------------
.btn-lg {
}

.btn-sm,
.btn-xs {
}

.btn-xs {
}


// Block button
// -----------------------
.btn-block {
}



//
// FORM VALIDATION
// -------------------------------------------------------

// Invalid
// -------
.invalid {
border-color: @red;
}

label.invalid {
color: @red;
}

input.invalid {
border: 1px solid @red;
}

5 changes: 4 additions & 1 deletion source/tpl_t3_bs3_blank/less/style.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,17 @@
}

.input {
background: url("@{t3-image-path}/ico/search-invert.png") no-repeat 8px center;
width: 120px;
padding-left: 26px;
// focus state
&:focus {
color: @gray-dark;
width: 180px;
}
&::before {
content: "test";
display: block;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/tpl_t3_bs3_blank/tpls/blocks/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<!-- //LOGO -->

<?php if ($headright): ?>
<div class="col-xs-12 col-md-4 clearfix">
<div class="col-xs-12 col-md-4">
<?php if ($this->countModules('head-search')) : ?>
<!-- HEAD SEARCH -->
<div class="head-search <?php $this->_c('head-search') ?>">
Expand Down
2 changes: 1 addition & 1 deletion source/tpl_t3_bs3_blank/tpls/blocks/mainnav.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".t3-navbar">
<i class="icon-reorder"></i>
<i class="fa fa-bars"></i>
</button>
</div>

Expand Down

0 comments on commit bca20a7

Please sign in to comment.