Skip to content
This repository was archived by the owner on Nov 18, 2020. It is now read-only.

Commit 77b09f0

Browse files
wujr5wujr5
committed
fix conflixt
2 parents e679b75 + 6533384 commit 77b09f0

11 files changed

Lines changed: 469 additions & 283 deletions

File tree

‎data/docs/components/radio.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
### Usage
44

55
```html
6-
<mu-radio value="male" name="sex" size="small"></mu-radio>
6+
<mu-radio-group name="sex" ng-model="selected">
7+
<mu-radio value="male" size="small"></mu-radio>
8+
</mu-radio-group>
9+
<mu-radio-group name="color" >
10+
<mu-radio value="blue" size="small"></mu-radio>
11+
<mu-radio value="red" size="small" checked></mu-radio>
12+
</mu-radio-group>
713
```
814

915
### Docs
@@ -18,3 +24,9 @@
1824
* 设置radio的大小
1925
* **small** 小
2026
* **big** 大
27+
28+
参数: ng-model
29+
* 与angular数据的双向绑定
30+
31+
参数: checked
32+
* 使得该radio初始被选中，但在ng-model被设置时无效

‎dist/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ function testCtrl($scope, $http) {
9696
angular.element(event.target).addClass('choose');
9797
};
9898

99+
$scope.radioData = {
100+
sex: 'male',
101+
color: 'blue'
102+
};
103+
99104
/* 按照顺序执行定义的函数 */
100105

101106
function initTestCtrl() {

‎dist/matrixui.css‎

Lines changed: 156 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -6,95 +6,13 @@
66
*
77
*/
88

9-
#matrixui-programming-report .report-section {
10-
margin-top: 24px;
11-
border-radius: 8px;
12-
background-color: #fff;
13-
padding: 36px;
14-
box-shadow: 0px 3px 10px #ccc;
15-
width: auto; }
16-
17-
#matrixui-programming-report .report-section .score {
18-
padding-bottom: 24px;
19-
margin-bottom: 5px;
20-
font-size: 24px;
21-
line-height: 24px;
22-
border-bottom: 1px solid #ccc;
23-
color: #479ea2; }
24-
25-
#matrixui-programming-report .report-section .static-check-score a.link, #matrixui-programming-report .report-section .memory-check-score a.link {
26-
float: right;
27-
font-size: 16px; }
28-
29-
#matrixui-programming-report .report-section .test-content {
30-
max-height: 500px; }
31-
32-
#matrixui-programming-report .report-section .test-content .report-detail {
33-
max-height: 500px;
34-
overflow: hidden; }
35-
36-
#matrixui-programming-report .report-section .test-content .report-detail pre.memory-check-summary {
37-
margin-top: 35px;
38-
font-size: 14px;
39-
font-weight: bold; }
40-
41-
#matrixui-programming-report .report-section .test-content .report-detail div.tests-check-summary pre {
42-
margin-left: 5px;
43-
margin-right: 10px;
44-
display: inline-block;
45-
font-size: 17px !important;
46-
font-weight: bold;
47-
background-color: white;
48-
padding: 0; }
49-
50-
#matrixui-programming-report .report-section .test-content .report-detail pre.full-score {
51-
color: #2b9161; }
52-
53-
#matrixui-programming-report .report-section .test-content .report-detail pre.not-executing-check, #matrixui-programming-report .report-section .test-content .report-detail div.message pre.error-content {
54-
color: #e0343c; }
55-
56-
#matrixui-programming-report .report-section .test-content .report-detail pre.under-checking {
57-
color: #FF9900; }
58-
59-
#matrixui-programming-report .report-section .test-content .report-detail pre.label {
60-
font-weight: bold;
61-
font-size: 17px; }
62-
63-
#matrixui-programming-report .report-section .test-content .report-detail pre.red-color {
64-
color: #df3636; }
65-
66-
#matrixui-programming-report .report-section .test-content .report-detail .error-detail {
67-
border: 1px solid #ccc;
68-
border-radius: 5px;
69-
padding: 12px;
70-
overflow: auto;
71-
max-height: 420px; }
72-
73-
#matrixui-programming-report .report-section .test-content .report-detail pre.error-content {
74-
letter-spacing: 0.02em;
75-
max-width: 99%;
76-
max-height: 500px;
77-
word-wrap: normal;
78-
overflow: auto;
79-
overflow-x: hidden;
80-
white-space: pre;
81-
line-height: 1.5em;
82-
white-space: -moz-pre-wrap;
83-
/* Mozilla, supported since 1999 */
84-
white-space: -pre-wrap;
85-
/* Opera */
86-
white-space: -o-pre-wrap;
87-
/* Opera */
88-
white-space: pre-wrap;
89-
/* CSS3 - Text module (Candidate Recommendation) http://www.w3.org/TR/css3-text/#white-space */
90-
word-wrap: break-word;
91-
/* IE 5.5+ */ }
92-
93-
#matrixui-programming-report .report-section .test-content .report-detail pre.inout-tests, #matrixui-programming-report .report-section .test-content .report-detail .memory-check {
94-
padding: 5px;
95-
border: 1px solid #CCCCCC;
96-
border-radius: 2px;
97-
background-color: #F5F5F5; }
9+
@charset "UTF-8";
10+
/**
11+
*
12+
* @description card组件
13+
* @author yourname <youremail>
14+
*
15+
*/
9816

9917
@charset "UTF-8";
10018
/**
@@ -153,14 +71,6 @@
15371
.mu-button-danger:hover {
15472
background-color: #f23c54; }
15573

156-
@charset "UTF-8";
157-
/**
158-
*
159-
* @description card组件
160-
* @author yourname <youremail>
161-
*
162-
*/
163-
16474
@charset "UTF-8";
16575
/**
16676
*
@@ -2056,56 +1966,72 @@ span.CodeMirror-selectedtext {
20561966
* @author williamking <williamjwking@gmail.com>
20571967
*
20581968
*/
2059-
.radio.big {
1969+
.radio-container.big .radio {
20601970
width: 34px;
20611971
height: 34px; }
20621972

2063-
.radio.small {
1973+
.radio-container.big .mu-label {
1974+
font-size: 32px; }
1975+
1976+
.radio-container.small .radio {
20641977
width: 16px;
20651978
height: 16px; }
20661979

2067-
.radio {
2068-
display: inline-block;
2069-
position: relative; }
2070-
.radio input {
2071-
display: none; }
2072-
.radio .regular-radio + label {
2073-
background-color: #ffffff;
2074-
border: 1px solid #4ca0a4;
2075-
padding: 7px;
2076-
cursor: pointer;
2077-
border-radius: 50%;
1980+
.radio-container.small .mu-label {
1981+
font-size: 14px; }
1982+
1983+
.radio-container {
1984+
margin-bottom: 16px; }
1985+
.radio-container .radio {
1986+
display: inline-block;
1987+
position: relative;
1988+
vertical-align: middle; }
1989+
.radio-container .radio input {
1990+
display: none; }
1991+
.radio-container .radio .regular-radio + label {
1992+
background-color: #ffffff;
1993+
border: 1px solid #4ca0a4;
1994+
padding: 7px;
1995+
cursor: pointer;
1996+
border-radius: 50%;
1997+
display: inline-block;
1998+
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), inset 0px -15px 10px -12px rgba(0, 0, 0, 0.05);
1999+
position: relative; }
2000+
.radio-container .radio .regular-radio:checked + label:after {
2001+
content: ' ';
2002+
width: 8px;
2003+
height: 8px;
2004+
border-radius: 50%;
2005+
position: absolute;
2006+
top: 3px;
2007+
background: #479ea2;
2008+
box-shadow: inset 0px 0px 10px rgba(0, 0, 0, 0.3);
2009+
left: 3px;
2010+
font-size: 32px; }
2011+
.radio-container .radio .regular-radio:checked + label {
2012+
background-color: #ffffff;
2013+
color: #479ea2;
2014+
border: 1px solid #4ca0a4;
2015+
display: inline-block; }
2016+
.radio-container .radio .regular-radio + label.big {
2017+
padding: 16px; }
2018+
.radio-container .radio .regular-radio:checked + label.big:after {
2019+
width: 24px;
2020+
height: 24px;
2021+
top: 4px;
2022+
left: 4px; }
2023+
.radio-container .radio .regular-radio:checked + label.big {
2024+
background-color: #ffffff;
2025+
color: #479ea2;
2026+
border: 1px solid #4ca0a4;
2027+
display: inline-block; }
2028+
.radio-container .mu-label {
2029+
margin-left: 6px;
2030+
vertical-align: middle;
20782031
display: inline-block;
2079-
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05), inset 0px -15px 10px -12px rgba(0, 0, 0, 0.05);
2080-
position: relative; }
2081-
.radio .regular-radio:checked + label:after {
2082-
content: ' ';
2083-
width: 8px;
2084-
height: 8px;
2085-
border-radius: 50%;
2086-
position: absolute;
2087-
top: 3px;
2088-
background: #479ea2;
2089-
box-shadow: inset 0px 0px 10px rgba(0, 0, 0, 0.3);
2090-
left: 3px;
2091-
font-size: 32px; }
2092-
.radio .regular-radio:checked + label {
2093-
background-color: #ffffff;
2094-
color: #479ea2;
2095-
border: 1px solid #4ca0a4;
2096-
display: inline-block; }
2097-
.radio .regular-radio + label.big {
2098-
padding: 16px; }
2099-
.radio .regular-radio:checked + label.big:after {
2100-
width: 24px;
2101-
height: 24px;
2102-
top: 4px;
2103-
left: 4px; }
2104-
.radio .regular-radio:checked + label.big {
2105-
background-color: #ffffff;
2106-
color: #479ea2;
2107-
border: 1px solid #4ca0a4;
2108-
display: inline-block; }
2032+
white-space: normal;
2033+
width: auto;
2034+
cursor: pointer; }
21092035

21102036
@charset "UTF-8";
21112037
/**
@@ -2496,3 +2422,93 @@ span.CodeMirror-selectedtext {
24962422
* @author yourname <youremail>
24972423
*
24982424
*/
2425+
2426+
#matrixui-programming-report .report-section {
2427+
margin-top: 24px;
2428+
border-radius: 8px;
2429+
background-color: #fff;
2430+
padding: 36px;
2431+
box-shadow: 0px 3px 10px #ccc;
2432+
width: auto; }
2433+
2434+
#matrixui-programming-report .report-section .score {
2435+
padding-bottom: 24px;
2436+
margin-bottom: 5px;
2437+
font-size: 24px;
2438+
line-height: 24px;
2439+
border-bottom: 1px solid #ccc;
2440+
color: #479ea2; }
2441+
2442+
#matrixui-programming-report .report-section .static-check-score a.link, #matrixui-programming-report .report-section .memory-check-score a.link {
2443+
float: right;
2444+
font-size: 16px; }
2445+
2446+
#matrixui-programming-report .report-section .test-content {
2447+
max-height: 500px; }
2448+
2449+
#matrixui-programming-report .report-section .test-content .report-detail {
2450+
max-height: 500px;
2451+
overflow: hidden; }
2452+
2453+
#matrixui-programming-report .report-section .test-content .report-detail pre.memory-check-summary {
2454+
margin-top: 35px;
2455+
font-size: 14px;
2456+
font-weight: bold; }
2457+
2458+
#matrixui-programming-report .report-section .test-content .report-detail div.tests-check-summary pre {
2459+
margin-left: 5px;
2460+
margin-right: 10px;
2461+
display: inline-block;
2462+
font-size: 17px !important;
2463+
font-weight: bold;
2464+
background-color: white;
2465+
padding: 0; }
2466+
2467+
#matrixui-programming-report .report-section .test-content .report-detail pre.full-score {
2468+
color: #2b9161; }
2469+
2470+
#matrixui-programming-report .report-section .test-content .report-detail pre.not-executing-check, #matrixui-programming-report .report-section .test-content .report-detail div.message pre.error-content {
2471+
color: #e0343c; }
2472+
2473+
#matrixui-programming-report .report-section .test-content .report-detail pre.under-checking {
2474+
color: #FF9900; }
2475+
2476+
#matrixui-programming-report .report-section .test-content .report-detail pre.label {
2477+
font-weight: bold;
2478+
font-size: 17px; }
2479+
2480+
#matrixui-programming-report .report-section .test-content .report-detail pre.red-color {
2481+
color: #df3636; }
2482+
2483+
#matrixui-programming-report .report-section .test-content .report-detail .error-detail {
2484+
border: 1px solid #ccc;
2485+
border-radius: 5px;
2486+
padding: 12px;
2487+
overflow: auto;
2488+
max-height: 420px; }
2489+
2490+
#matrixui-programming-report .report-section .test-content .report-detail pre.error-content {
2491+
letter-spacing: 0.02em;
2492+
max-width: 99%;
2493+
max-height: 500px;
2494+
word-wrap: normal;
2495+
overflow: auto;
2496+
overflow-x: hidden;
2497+
white-space: pre;
2498+
line-height: 1.5em;
2499+
white-space: -moz-pre-wrap;
2500+
/* Mozilla, supported since 1999 */
2501+
white-space: -pre-wrap;
2502+
/* Opera */
2503+
white-space: -o-pre-wrap;
2504+
/* Opera */
2505+
white-space: pre-wrap;
2506+
/* CSS3 - Text module (Candidate Recommendation) http://www.w3.org/TR/css3-text/#white-space */
2507+
word-wrap: break-word;
2508+
/* IE 5.5+ */ }
2509+
2510+
#matrixui-programming-report .report-section .test-content .report-detail pre.inout-tests, #matrixui-programming-report .report-section .test-content .report-detail .memory-check {
2511+
padding: 5px;
2512+
border: 1px solid #CCCCCC;
2513+
border-radius: 2px;
2514+
background-color: #F5F5F5; }

0 commit comments

Comments
 (0)