mirror of
				https://github.com/mdbootstrap/mdb-ui-kit.git
				synced 2025-11-04 09:57:36 +03:00 
			
		
		
		
	change font to Roboto, change border radius and fab style to reflect google guidelines
This commit is contained in:
		
							parent
							
								
									16af0a6f76
								
							
						
					
					
						commit
						eb116a89b6
					
				
							
								
								
									
										5793
									
								
								dist/css/material-wfont.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5793
									
								
								dist/css/material-wfont.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/css/material-wfont.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/css/material-wfont.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										5793
									
								
								dist/css/material.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5793
									
								
								dist/css/material.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/css/material.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/css/material.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										19
									
								
								dist/css/ripples.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										19
									
								
								dist/css/ripples.css
									
									
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
.withripple {
 | 
					.withripple {
 | 
				
			||||||
  position: relative;
 | 
					  position: relative; }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
.ripple-wrapper {
 | 
					.ripple-wrapper {
 | 
				
			||||||
  position: absolute;
 | 
					  position: absolute;
 | 
				
			||||||
  top: 0;
 | 
					  top: 0;
 | 
				
			||||||
| 
						 | 
					@ -9,8 +9,8 @@
 | 
				
			||||||
  width: 100%;
 | 
					  width: 100%;
 | 
				
			||||||
  height: 100%;
 | 
					  height: 100%;
 | 
				
			||||||
  overflow: hidden;
 | 
					  overflow: hidden;
 | 
				
			||||||
  border-radius: 2px;
 | 
					  border-radius: 2px; }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
.ripple {
 | 
					.ripple {
 | 
				
			||||||
  position: absolute;
 | 
					  position: absolute;
 | 
				
			||||||
  width: 20px;
 | 
					  width: 20px;
 | 
				
			||||||
| 
						 | 
					@ -26,15 +26,14 @@
 | 
				
			||||||
      -ms-transform-origin: 50%;
 | 
					      -ms-transform-origin: 50%;
 | 
				
			||||||
          transform-origin: 50%;
 | 
					          transform-origin: 50%;
 | 
				
			||||||
  opacity: 0;
 | 
					  opacity: 0;
 | 
				
			||||||
  pointer-events: none;
 | 
					  pointer-events: none; }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
.ripple.ripple-on {
 | 
					.ripple.ripple-on {
 | 
				
			||||||
  -webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
 | 
					  -webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
 | 
				
			||||||
          transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
 | 
					          transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
 | 
				
			||||||
  opacity: 1;
 | 
					  opacity: 1; }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
.ripple.ripple-out {
 | 
					.ripple.ripple-out {
 | 
				
			||||||
  -webkit-transition: opacity 0.1s linear 0s !important;
 | 
					  -webkit-transition: opacity 0.1s linear 0s !important;
 | 
				
			||||||
          transition: opacity 0.1s linear 0s !important;
 | 
					          transition: opacity 0.1s linear 0s !important;
 | 
				
			||||||
  opacity: 0;
 | 
					  opacity: 0; }
 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										5
									
								
								less/_buttons.import.less
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								less/_buttons.import.less
									
									
									
									
										vendored
									
									
								
							| 
						 | 
					@ -15,7 +15,7 @@
 | 
				
			||||||
    margin: 10px 1px;
 | 
					    margin: 10px 1px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    cursor: pointer;
 | 
					    cursor: pointer;
 | 
				
			||||||
    border-radius: 4px;
 | 
					    border-radius: 2px;
 | 
				
			||||||
    text-transform: uppercase;
 | 
					    text-transform: uppercase;
 | 
				
			||||||
    text-decoration: none;
 | 
					    text-decoration: none;
 | 
				
			||||||
    color: @darkbg-text;
 | 
					    color: @darkbg-text;
 | 
				
			||||||
| 
						 | 
					@ -64,7 +64,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.btn-group, .btn-group-vertical {
 | 
					.btn-group, .btn-group-vertical {
 | 
				
			||||||
    position: relative;
 | 
					    position: relative;
 | 
				
			||||||
    border-radius: 4px;
 | 
					    border-radius: 2px;
 | 
				
			||||||
    margin: 10px 1px;
 | 
					    margin: 10px 1px;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    .btn-shadow();
 | 
					    .btn-shadow();
 | 
				
			||||||
| 
						 | 
					@ -93,6 +93,7 @@
 | 
				
			||||||
    width: 56px;
 | 
					    width: 56px;
 | 
				
			||||||
    height: 56px;
 | 
					    height: 56px;
 | 
				
			||||||
    &, &:hover {
 | 
					    &, &:hover {
 | 
				
			||||||
 | 
					        .shadow-z-1();
 | 
				
			||||||
        .variations(~"", background-color, transparent);
 | 
					        .variations(~"", background-color, transparent);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    &, .ripple-wrapper {
 | 
					    &, .ripple-wrapper {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,8 +17,15 @@ body {
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 | 
					body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 {
 | 
				
			||||||
 | 
					    font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
 | 
				
			||||||
 | 
					    font-weight: 300;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					h5, h6{
 | 
				
			||||||
    font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
 | 
					    font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif;
 | 
				
			||||||
 | 
					    font-weight: 400;
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Well and Jumbotrons
 | 
					// Well and Jumbotrons
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										2
									
								
								template/material/css/material-wfont.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								template/material/css/material-wfont.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										2
									
								
								template/material/css/material.min.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								template/material/css/material.min.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
.withripple {
 | 
					.withripple {
 | 
				
			||||||
  position: relative;
 | 
					  position: relative; }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
.ripple-wrapper {
 | 
					.ripple-wrapper {
 | 
				
			||||||
  position: absolute;
 | 
					  position: absolute;
 | 
				
			||||||
  top: 0;
 | 
					  top: 0;
 | 
				
			||||||
| 
						 | 
					@ -9,8 +9,8 @@
 | 
				
			||||||
  width: 100%;
 | 
					  width: 100%;
 | 
				
			||||||
  height: 100%;
 | 
					  height: 100%;
 | 
				
			||||||
  overflow: hidden;
 | 
					  overflow: hidden;
 | 
				
			||||||
  border-radius: 2px;
 | 
					  border-radius: 2px; }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
.ripple {
 | 
					.ripple {
 | 
				
			||||||
  position: absolute;
 | 
					  position: absolute;
 | 
				
			||||||
  width: 20px;
 | 
					  width: 20px;
 | 
				
			||||||
| 
						 | 
					@ -26,15 +26,14 @@
 | 
				
			||||||
      -ms-transform-origin: 50%;
 | 
					      -ms-transform-origin: 50%;
 | 
				
			||||||
          transform-origin: 50%;
 | 
					          transform-origin: 50%;
 | 
				
			||||||
  opacity: 0;
 | 
					  opacity: 0;
 | 
				
			||||||
  pointer-events: none;
 | 
					  pointer-events: none; }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
.ripple.ripple-on {
 | 
					.ripple.ripple-on {
 | 
				
			||||||
  -webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
 | 
					  -webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
 | 
				
			||||||
          transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
 | 
					          transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
 | 
				
			||||||
  opacity: 1;
 | 
					  opacity: 1; }
 | 
				
			||||||
}
 | 
					
 | 
				
			||||||
.ripple.ripple-out {
 | 
					.ripple.ripple-out {
 | 
				
			||||||
  -webkit-transition: opacity 0.1s linear 0s !important;
 | 
					  -webkit-transition: opacity 0.1s linear 0s !important;
 | 
				
			||||||
          transition: opacity 0.1s linear 0s !important;
 | 
					          transition: opacity 0.1s linear 0s !important;
 | 
				
			||||||
  opacity: 0;
 | 
					  opacity: 0; }
 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
/* Copyright 2014+, Federico Zivolo, LICENSE at https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md */
 | 
					/* Copyright 2014+, Federico Zivolo, LICENSE at https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md */
 | 
				
			||||||
/* globals CustomEvent */
 | 
					/* globals CustomEvent */
 | 
				
			||||||
 | 
					/*jshint maxlen: 500 */
 | 
				
			||||||
window.ripples = {
 | 
					window.ripples = {
 | 
				
			||||||
    init : function(withRipple) {
 | 
					    init : function(withRipple) {
 | 
				
			||||||
        "use strict";
 | 
					        "use strict";
 | 
				
			||||||
| 
						 | 
					@ -56,10 +56,10 @@ window.ripples = {
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
            // This changes the alpha value of the rgba (opacity) to the constant __rippleOpacity__
 | 
					            // This changes the alpha value of the rgba (opacity) to the constant __rippleOpacity__
 | 
				
			||||||
            // Not sure if regexp is quicker... 
 | 
					            // Not sure if regexp is quicker... 
 | 
				
			||||||
            rgbArr = targetColor.split(',');                        
 | 
					            rgbArr = targetColor.split(",");                        
 | 
				
			||||||
            rgbArr.pop();
 | 
					            rgbArr.pop();
 | 
				
			||||||
            rgbArr.push(" " + __rippleOpacity__ + ")")            
 | 
					            rgbArr.push(" " + __rippleOpacity__ + ")");
 | 
				
			||||||
            targetColor = rgbArr.join(',');
 | 
					            targetColor = rgbArr.join(",");
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // Insert new ripple into ripple wrapper
 | 
					            // Insert new ripple into ripple wrapper
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user